diff --git a/Theme/Backend/equipment-list.tpl.php b/Theme/Backend/equipment-list.tpl.php
index 143dfa8..28a937e 100755
--- a/Theme/Backend/equipment-list.tpl.php
+++ b/Theme/Backend/equipment-list.tpl.php
@@ -81,7 +81,7 @@ echo $this->data['nav']->render(); ?>
                     $count = 0;
                     foreach ($equipments as $key => $value) :
                         ++$count;
-                        $url = UriFactory::build('{/base}/equipment/equipment/view?{?}&id=' . $value->id);
+                        $url = UriFactory::build('{/base}/equipment/view?{?}&id=' . $value->id);
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td>
diff --git a/Theme/Backend/equipment-view.tpl.php b/Theme/Backend/equipment-view.tpl.php
index 0b40d7b..204d267 100755
--- a/Theme/Backend/equipment-view.tpl.php
+++ b/Theme/Backend/equipment-view.tpl.php
@@ -81,7 +81,7 @@ echo $this->data['nav']->render();
 
                             <div class="form-group">
                                 <label for="iEquipmentLocation"><?= $this->getHtml('Location'); ?></label>
-                                <input type="text" id="iEquipmentLocation" name="location" value="<?= $this->printHtml($asset->number); ?>">
+                                <input type="text" id="iEquipmentLocation" name="location" value="<?= $this->printHtml($equipment->location); ?>">
                             </div>
 
                             <div class="form-group">
@@ -134,6 +134,7 @@ echo $this->data['nav']->render();
                     </section>
                 </div>
 
+                <?php if (!$isNew) : ?>
                 <div class="col-xs-12 col-md-6">
                     <section class="portlet">
                         <div class="portlet-body">
@@ -143,6 +144,7 @@ echo $this->data['nav']->render();
                         </div>
                     </section>
                 </div>
+                <?php endif; ?>
             </div>
         </div>