diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index a2dc75113d..2a13b272f8 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -14,7 +14,7 @@ class ActionlogPresenter extends Presenter
                 return $user->present()->nameUrl();
             }
             // The user was deleted
-            return '<del>'.$user->getFullNameAttribute().'</del> (deleted)';
+            return '<del>'.$user->display_name.'</del> (deleted)';
         }
 
         return '';
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index b02a6e4fcd..a4b160771f 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -524,7 +524,7 @@ class UserPresenter extends Presenter
      */
     public function nameUrl()
     {
-        return (string) link_to_route('users.show', $this->getFullNameAttribute(), $this->id);
+        return (string) link_to_route('users.show', $this->display_name, $this->id);
     }
 
     /**
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 2559f302df..d0e649012b 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -24,7 +24,7 @@
 
   <!-- Asset Tag -->
     <div class="form-group {{ ($errors->has('asset_tag') || $errors->has('asset_tags.1')) ? ' has-error' : '' }}">
-    <label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
+      <label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
 
 
 
@@ -134,7 +134,7 @@
     </div>
 
 
-        <div class="col-md-12 col-sm-12">
+    <div class="col-md-12 col-sm-12">
 
         <fieldset name="optional-details">
 
@@ -166,38 +166,36 @@
             </div> <!-- end optional details -->
         </fieldset>
 
-        </div><!-- end col-md-12 col-sm-12-->
-
-
-
-        <div class="col-md-12 col-sm-12">
-            <fieldset name="order-info">
-                <x-form-legend>
-                    <a id="order_info">
-                        <x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
-                        {{ trans('admin/hardware/form.order_details') }}
-                    </a>
-                </x-form-legend>
-
-                <div id='order_details' class="col-md-12" style="display:none">
-                    @include ('partials.forms.edit.order_number')
-                    @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
-                    @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
-                    @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
-
-                    @php
-                        $currency_type = null;
-                        if ($item->id && $item->location) {
-                            $currency_type = $item->location->currency;
-                        }
-                    @endphp
-
-                    @include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
-
-                </div> <!-- end order details -->
-            </fieldset>
-        </div><!-- end col-md-12 col-sm-12-->
     </div><!-- end col-md-12 col-sm-12-->
+
+
+
+    <div class="col-md-12 col-sm-12">
+        <fieldset name="order-info">
+            <x-form-legend>
+                <a id="order_info">
+                    <x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
+                    {{ trans('admin/hardware/form.order_details') }}
+                </a>
+            </x-form-legend>
+
+            <div id='order_details' class="col-md-12" style="display:none">
+                @include ('partials.forms.edit.order_number')
+                @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
+                @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.eol_date'),'fieldname' => 'asset_eol_date'])
+                @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
+
+                @php
+                    $currency_type = null;
+                    if ($item->id && $item->location) {
+                        $currency_type = $item->location->currency;
+                    }
+                @endphp
+
+                @include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
+
+            </div> <!-- end order details -->
+        </fieldset>
     </div><!-- end col-md-12 col-sm-12-->
    
 @stop