diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 2466fe15b8..f44a8b5735 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -151,8 +151,10 @@ class AssetsController extends Controller
 
         if ($asset = Asset::withTrashed()->find($id)) {
             $this->authorize('view', $asset);
+
             $asset = $asset->present()->detail();
-            return $asset;
+            return (new AssetsTransformer)->transformAsset($asset);
+
         }
 
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index bcc95b3a7f..df9da9677a 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -3,6 +3,7 @@ namespace App\Http\Transformers;
 
 use App\Models\Asset;
 use Illuminate\Database\Eloquent\Collection;
+use App\Http\Transformers\UsersTransformer;
 
 class AssetsTransformer
 {
@@ -33,9 +34,9 @@ class AssetsTransformer
             'expected_checkin' => $asset->expected_checkin,
             'order_number' => $asset->order_number,
             'companyName' => $asset->companyName,
-            'location' => ($asset->assetLoc) ? $asset->assetLoc->name : '',
+            'location' => ($asset->assetLoc) ? $asset->assetLoc : '',
             'image' => $asset->image,
-            'assigned_to' => ($asset->assigneduser) ? $asset->assigneduser->present()->fullName() : '',
+            'assigned_to' => ($asset->assigneduser) ? (new UsersTransformer)->transformUser($asset->assigneduser) : null,
             'created_at' => $asset->created_at,
             'purchase_date' => $asset->purchase_date,
             'purchase_cost' => $asset->purchase_cost,
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
index 874ac64e3e..a4711b0d39 100644
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -17,7 +17,7 @@ class LocationsTransformer
     public function transformLocation (Location $location = null)
     {
         if ($location) {
-            $locations_array[] = [
+            $transformed = [
                 'id' => e($location->id),
                 'name' => e($location->name),
                 'address' => e($location->address),
@@ -25,7 +25,7 @@ class LocationsTransformer
                 'state' => e($location->state),
                 'country' => e($location->country),
             ];
-            return $locations_array;
+            return $transformed;
         }
 
 
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index 4244a6c5f8..6c6bbff2f0 100755
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -37,7 +37,7 @@
                 <th data-searchable="false" data-sortable="false" data-field="assets_count">{{ trans('general.assets') }}</th>
                 <th data-searchable="false" data-sortable="true" data-field="require_acceptance">{{ trans('admin/categories/table.require_acceptance') }}</th>
                 <th data-searchable="false" data-sortable="true" data-field="use_default_eula">{{ trans('admin/categories/table.eula_text') }}</th>
-                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                <th data-formatter="categoriesActionsFormatter" data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>
           </table>
diff --git a/resources/views/components/index.blade.php b/resources/views/components/index.blade.php
index b1cdc77262..d773302c99 100644
--- a/resources/views/components/index.blade.php
+++ b/resources/views/components/index.blade.php
@@ -37,7 +37,7 @@
           name="components"
           class="table table-striped snipe-table"
           id="table"
-          data-url="{{route('api.components.list') }}"
+          data-url="{{route('api.components.index') }}"
           data-cookie="true"
           data-click-to-select="true"
           data-cookie-id-table="componentsTable-{{ config('version.hash_version') }}-{{ config('version.hash_version') }}"
diff --git a/resources/views/depreciations/index.blade.php b/resources/views/depreciations/index.blade.php
index 1f7eadbb24..09272797a8 100755
--- a/resources/views/depreciations/index.blade.php
+++ b/resources/views/depreciations/index.blade.php
@@ -24,7 +24,7 @@ Asset Depreciations
           name="depreciations"
           class="table table-striped snipe-table"
           id="table"
-          data-url="{{ route('api.depreciations.list') }}"
+          data-url="{{ route('api.depreciations.index') }}"
           data-cookie="true"
           data-cookie-id-table="depreciationsTable-{{ config('version.hash_version') }}">
             <thead>
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index c3e8ffabef..b6e03519d4 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -23,7 +23,7 @@
           class="table table-striped snipe-table"
           id="table"
           data-toggle="table"
-          data-url="{{ route('api.groups.list') }}"
+          data-url="{{ route('api.groups.index') }}"
           data-cookie="true"
           data-click-to-select="true"
           data-cookie-id-table="userGroupDisplay-{{ config('version.hash_version') }}">
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index 32460f222b..07f887a3df 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -74,18 +74,18 @@
                           <th data-checkbox="true" data-field="checkbox"></th>
                     @endif
                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                    <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
+                    <th data-field="companyName" data-formatter="companiesLinkObjFormatter" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
                     <th data-sortable="true" data-field="image" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
-                    <th data-sortable="true" data-field="name" data-visible="false" data-formatter="assetFormatter">{{ trans('admin/hardware/form.name') }}</th>
-                    <th data-sortable="true" data-field="asset_tag" data-formatter="assetFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                    <th data-sortable="true" data-field="serial" data-formatter="assetFormatter">{{ trans('admin/hardware/table.serial') }}</th>
-                    <th data-sortable="true" data-field="model" data-formatter="modelFormatter">{{ trans('admin/hardware/form.model') }}</th>
+                    <th data-sortable="true" data-field="name" data-visible="false" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/form.name') }}</th>
+                    <th data-sortable="true" data-field="asset_tag" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                    <th data-sortable="true" data-field="serial" data-formatter="hardwareLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
+                    <th data-sortable="true" data-field="model" data-formatter="modelsLinkObjFormatter">{{ trans('admin/hardware/form.model') }}</th>
                     <th data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
-                    <th data-sortable="true" data-field="status_label" data-formatter="statusFormatter">{{ trans('admin/hardware/table.status') }}</th>
-                    <th data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
-                    <th data-sortable="true" data-formatter="locationFormatter" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
-                    <th data-sortable="true" data-field="category" data-searchable="true" data-formatter="categoryFormatter">{{ trans('general.category') }}</th>
-                    <th data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
+                    <th data-sortable="true" data-field="status_label" data-formatter="statuslabelsLinkObjFormatter">{{ trans('admin/hardware/table.status') }}</th>
+                    <th data-sortable="true" data-formatter="usersLinkObjFormatter" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
+                    <th data-sortable="true" data-formatter="locationsLinkObjFormatter" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
+                    <th data-sortable="true" data-field="category" data-searchable="true" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
+                    <th data-sortable="true" data-field="manufacturer" data-formatter="manufacturersLinkObjFormatter" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
                     <th data-sortable="true" data-field="purchase_cost" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.cost') }}</th>
                     <th data-sortable="true" data-field="purchase_date" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.date') }}</th>
                     <th data-sortable="false" data-field="eol" data-searchable="true">{{ trans('general.eol') }}</th>
@@ -108,7 +108,7 @@
                     <th data-sortable="true" data-field="created_at" data-formatter="createdAtFormatter" data-searchable="true" data-visible="false">{{ trans('general.created_at') }}</th>
                     <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="change">{{ trans('admin/hardware/table.change') }}</th>
 
-                    <th data-switchable="false" data-searchable="false" data-formatter="actionsFormatter" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
+                    <th data-switchable="false" data-searchable="false" data-formatter="hardwareActionsFormatter" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
                   </tr>
                 </thead>
               </table>
@@ -128,18 +128,4 @@
     'multiSort' => true
 ])
 
-<script>
-
-    function actionsFormatter(value, row) {
-        return '<nobr><a href="{{ url('/') }}/hardware/' + row.id + '/edit" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></a> '
-            + '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
-            + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
-            + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
-            + '<i class="fa fa-trash"></i></a></nobr>';
-
-    }
-
-
-
-</script>
 @stop
diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php
index df7405949a..953ea02e84 100755
--- a/resources/views/licenses/index.blade.php
+++ b/resources/views/licenses/index.blade.php
@@ -35,9 +35,9 @@
                 <tr>
                     <th data-checkbox="true" data-field="checkbox"></th>
                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                    <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companyFormatter">{{ trans('general.company') }}</th>
-                    <th data-sortable="true" data-field="name" data-visible="false" data-formatter="licenseFormatter">{{ trans('admin/licenses/table.title') }}</th>
-                    <th data-field="manufacturer" data-sortable="true" data-formatter="manufacturerFormatter">{{ trans('general.manufacturer') }}</th>
+                    <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('general.company') }}</th>
+                    <th data-sortable="true" data-field="name" data-visible="false" data-formatter="licensesLinkFormatter">{{ trans('admin/licenses/table.title') }}</th>
+                    <th data-field="manufacturer" data-sortable="true" data-formatter="manufacturersLinkObjFormatter">{{ trans('general.manufacturer') }}</th>
                     <th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/form.license_key') }}</th>
                     <th data-field="license_name" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_name') }}</th>
                     <th data-field="license_email" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_email') }}</th>
@@ -50,7 +50,7 @@
                     <th data-sortable="true" data-field="created_at" data-formatter="createdAtFormatter" data-searchable="true" data-visible="false">{{ trans('general.created_at') }}</th>
                     <th data-field="notes" data-sortable="true" data-visible="false">{{ trans('admin/hardware/form.notes') }}</th>
 
-                    <th data-switchable="false" data-searchable="false" data-formatter="actionsFormatter" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
+                    <th data-switchable="false" data-searchable="false" data-formatter="licensesActionsFormatter" data-sortable="false" data-field="actions" >{{ trans('table.actions') }}</th>
                 </tr>
             </thead>
         </table>
@@ -66,16 +66,4 @@
 @section('moar_scripts')
 @include ('partials.bootstrap-table', ['exportFile' => 'licenses-export', 'search' => true])
 
-<script>
-
-    function actionsFormatter(value, row) {
-        return '<nobr><a href="{{ url('/') }}/licenses/' + row.id + '/edit" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></a> '
-            + '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
-            + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
-            + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
-            + '<i class="fa fa-trash"></i></a></nobr>';
-
-    }
-
-</script>
 @stop
diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php
index 41b175ae69..72a2946377 100755
--- a/resources/views/locations/index.blade.php
+++ b/resources/views/locations/index.blade.php
@@ -28,7 +28,7 @@
             <thead>
               <tr>
                 <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                <th data-sortable="true" data-field="name">{{ trans('admin/locations/table.name') }}</th>
+                <th data-sortable="true" data-formatter="locationsLinkFormatter" data-field="name" data-searchable="true">{{ trans('admin/locations/table.name') }}</th>
                 <th data-sortable="true" data-field="parent">{{ trans('admin/locations/table.parent') }}</th>
                 <th data-searchable="false" data-sortable="false" data-field="assets_default">{{ trans('admin/locations/table.assets_rtd') }}</th>
                 <th data-searchable="false" data-sortable="false" data-field="assets_checkedout">{{ trans('admin/locations/table.assets_checkedout') }}</th>
@@ -44,7 +44,7 @@
                   </th>
                 <th data-searchable="true" data-sortable="true" data-field="country">
                 {{ trans('admin/locations/table.country') }}</th>
-                <th data-switchable="false" data-formatter="actionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                <th data-switchable="false" data-formatter="locationsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>
           </table>
@@ -59,14 +59,4 @@
 @section('moar_scripts')
 @include ('partials.bootstrap-table', ['exportFile' => 'locations-export', 'search' => true])
 
-  <script>
-      function actionsFormatter(value, row) {
-          return '<a href="{{ url('/') }}/locations/' + row.id + '/edit" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></a> '
-          + '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
-          + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
-          + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
-          + '<i class="fa fa-trash"></i></a>';
-
-      }
-  </script>
 @stop
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index f4e75344f7..86d41743d2 100755
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -36,7 +36,7 @@
                 <th data-switchable="true" data-searchable="false" data-sortable="false" data-field="licenses_count">{{ trans('general.licenses') }}</th>
                 <th data-switchable="true" data-searchable="false" data-sortable="false" data-field="accessories_count">{{ trans('general.accessories') }}</th>
                 <th data-switchable="true" data-searchable="false" data-sortable="false" data-field="consumables_count">{{ trans('general.consumables') }}</th>
-                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                <th data-formatter="manufacturersActionsFormatter" data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>
           </table>
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index 1cab62bb6a..172d1024ec 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -39,7 +39,7 @@
               <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
               <th data-sortable="true" data-field="image"  data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
               <th data-sortable="false" data-field="manufacturer">{{ trans('general.manufacturer') }}</th>
-              <th data-sortable="true" data-field="name">{{ trans('admin/models/table.title') }}</th>
+              <th data-sortable="true" data-field="name" data-formatter="modelsLinkFormatter">{{ trans('admin/models/table.title') }}</th>
               <th data-sortable="true" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
               <th data-sortable="false" data-field="assets_count">{{ trans('admin/models/table.numassets') }}</th>
               <th data-sortable="false" data-field="depreciation">{{ trans('general.depreciation') }}</th>
@@ -47,7 +47,7 @@
               <th data-sortable="true" data-field="eol">{{ trans('general.eol') }}</th>
               <th data-sortable="false" data-field="fieldset">{{ trans('admin/models/general.fieldset') }}</th>
               <th data-sortable="true" data-field="notes">{{ trans('general.notes') }}</th>
-              <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+              <th data-switchable="false" data-formatter="modelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
             </tr>
           </thead>
         </table>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index c48f0959a0..e4561cbf70 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -44,7 +44,7 @@
         name="modelassets"
         id="table"
         class="snipe-table"
-        data-url="{{route('api.models.view', $model->id)}}"
+        data-url="{{route('api.models.show', $model->id)}}"
         data-cookie="true"
         data-click-to-select="true"
         data-cookie-id-table="modeldetailsViewTable">
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index ea582615f8..1eb7cd9f82 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -78,6 +78,53 @@ $('.snipe-table').bootstrapTable({
     });
 
 
+    // This only works for model index pages because it uses the row's model ID
+    function genericRowLinkFormatter(destination) {
+        return function (value,row) {
+            if (value) {
+                return '<a href="{{ url('/') }}/' + destination + '/' + row.id + '"> ' + value + '</a>';
+            }
+        };
+    }
+
+    // Use this when we're introspecting into a column object and need to link
+    function genericColumnObjLinkFormatter(destination) {
+        return function (value,row) {
+            if ((value) && (value.name)) {
+                return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a>';
+            }
+        };
+    }
+
+    function genericActionsFormatter(destination) {
+        return function (value,row) {
+                return '<nobr><a href="{{ url('/') }}/' + destination + '/' + row.id + '/edit" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></a> '
+                    + '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
+                    + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
+                    + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
+                    + '<i class="fa fa-trash"></i></a></nobr>';
+        };
+    }
+
+    // Use this when we're introspecting into a column object with more than one item
+    function genericColumnArrayLinkFormatter(destination) {
+        return function (value,row) {
+            if ((value) && (value.name)) {
+                return '<a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a>';
+            }
+        };
+    }
+
+    var formatters = ['hardware','locations','users','manufacturers','statuslabels','models','licenses','categories','suppliers','companies'];
+
+    for (var i in formatters) {
+        window[formatters[i] + 'LinkFormatter'] = genericRowLinkFormatter(formatters[i]);
+        window[formatters[i] + 'LinkObjFormatter'] = genericColumnObjLinkFormatter(formatters[i]);
+        window[formatters[i] + 'ActionsFormatter'] = genericActionsFormatter(formatters[i]);
+    }
+
+
+
     function createdAtFormatter(value, row) {
         if ((value) && (value.date)) {
             return value.date;
@@ -92,61 +139,6 @@ $('.snipe-table').bootstrapTable({
         }
     }
 
-    function userFormatter(value, row) {
-        if (value.name) {
-            return '<a href="{{ url('/') }}/users/' + value.id + '"> ' + value.name + '</a>';
-        } else if (value) {
-            return '<a href="{{ url('/') }}/users/' + row.id + '"> ' + value + '</a>';
-        }
-    }
-
-    function assetFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/hardware/' + row.id + '"> ' + value + '</a>';
-        }
-    }
-
-    function manufacturerFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/manufacturers/' + row.id + '"> ' + value.name + '</a>';
-        }
-    }
-
-    function statusFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/statuslabels/' + value.id + '"> ' + value.name + '</a>';
-        }
-    }
-
-    function modelFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/models/' + value.id + '"> ' + value.name + '</a>';
-        }
-    }
-
-    function licenseFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/licenses/' + row.id + '"> ' + row.name + '</a>';
-        }
-    }
-
-    function categoryFormatter(value, row) {
-        if (value) {
-            return '<a href="{{ url('/') }}/categories/' + value.id + '"> ' + value.name + '</a>';
-        }
-    }
-
-    function companyFormatter(value, row) {
-        if ((value) && (value[0].name)) {
-            return '<a href="{{ url('/') }}/companies/' + value[0].id + '"> ' + value[0].name + '</a>';
-        }
-    }
-
-    function locationFormatter(value, row) {
-        if ((value) && (value[0].name)) {
-            return '<a href="{{ url('/') }}/locations/' + value[0].id + '"> ' + value[0].name + '</a>';
-        }
-    }
 
     function emailFormatter(value, row) {
         if (value) {
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index f010c8a646..a721dfd066 100755
--- a/resources/views/statuslabels/index.blade.php
+++ b/resources/views/statuslabels/index.blade.php
@@ -34,7 +34,7 @@
                 <th data-sortable="false" data-field="type">{{ trans('admin/statuslabels/table.status_type') }}</th>
                 <th data-sortable="false" data-field="color">{{ trans('admin/statuslabels/table.color') }}</th>
                 <th data-sortable="true" data-field="show_in_nav">{{ trans('admin/statuslabels/table.show_in_nav') }}</th>
-                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                <th data-switchable="false" data-formatter="statuslabelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>
           </table>
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index cdeef1cca9..1a8dbf98aa 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -53,13 +53,13 @@
                                     <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
                                     <th data-sortable="true" data-field="image" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
                                     <th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
-                                    <th data-sortable="true" data-field="asset_tag" data-formatter="assetFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                                    <th data-sortable="true" data-field="serial" data-formatter="assetFormatter">{{ trans('admin/hardware/table.serial') }}</th>
+                                    <th data-sortable="true" data-field="asset_tag" data-formatter="assetLinkFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                                    <th data-sortable="true" data-field="serial" data-formatter="assetLinkFormatter">{{ trans('admin/hardware/table.serial') }}</th>
                                     <th data-sortable="true" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
                                     <th data-sortable="true" data-field="model_number" data-visible="false">{{ trans('admin/models/table.modelnumber') }}</th>
 
                                     <th data-sortable="true" data-field="assigned_to">{{ trans('admin/hardware/form.checkedout_to') }}</th>
-                                    <th data-sortable="true" data-formatter="locationFormatter" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
+                                    <th data-sortable="true" data-formatter="locationsLinkObjFormatter" data-field="location" data-searchable="true">{{ trans('admin/hardware/table.location') }}</th>
                                     <th data-sortable="true" data-field="category" data-searchable="true">{{ trans('general.category') }}</th>
                                     <th data-sortable="true" data-field="manufacturer" data-searchable="true" data-visible="false">{{ trans('general.manufacturer') }}</th>
                                     <th data-sortable="true" data-field="purchase_cost" data-searchable="true" data-visible="false">{{ trans('admin/hardware/form.cost') }}</th>
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index ee3ea51eed..5d8f8cf42e 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -38,7 +38,7 @@
             <th data-searchable="true" data-sortable="true" data-field="fax" data-visible="false">{{ trans('admin/suppliers/table.fax') }}</th>
             <th data-searchable="false" data-sortable="false" data-field="assets">{{ trans('admin/suppliers/table.assets') }}</th>
             <th data-searchable="false" data-sortable="false" data-field="licenses">{{ trans('admin/suppliers/table.licenses') }}</th>
-            <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+            <th data-switchable="false" data-formatter="suppliersActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
           </tr>
         </thead>
       </table>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index e3a4abd40a..fb91017345 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -75,15 +75,15 @@
                    <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                    <th data-switchable="true" data-sortable="false" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
                    <th data-switchable="true" data-sortable="true" data-field="employee_num" data-visible="false">{{ trans('admin/users/table.employee_num') }}</th>
-                   <th data-sortable="true" data-field="name" data-formatter="userFormatter">{{ trans('admin/users/table.name') }}</th>
+                   <th data-sortable="true" data-field="name" data-formatter="userLinkFormatter">{{ trans('admin/users/table.name') }}</th>
                    <th data-switchable="true" data-sortable="true" data-field="jobtitle" data-visible="false">{{ trans('admin/users/table.title') }}</th>
                    <th data-sortable="true" data-field="email" data-formatter="emailFormatter">
                        <span class="hidden-md hidden-lg">{{ trans('admin/users/table.email') }}</span>
                        <span class="hidden-xs"><i class="fa fa-envelope fa-lg"></i></span>
                    </th>
                    <th data-sortable="true" data-field="username">{{ trans('admin/users/table.username') }}</th>
-                   <th data-searchable="true" data-sortable="true" data-field="manager" data-formatter="userFormatter">{{ trans('admin/users/table.manager') }}</th>
-                   <th data-sortable="true" data-field="location" data-formatter="locationFormatter">{{ trans('admin/users/table.location') }}</th>
+                   <th data-searchable="true" data-sortable="true" data-field="manager" data-formatter="userLinkObjFormatter">{{ trans('admin/users/table.manager') }}</th>
+                   <th data-sortable="true" data-field="location" data-formatter="locationsLinkObjFormatter">{{ trans('admin/users/table.location') }}</th>
                    <th data-sortable="false" data-field="assets">
                        <span class="hidden-md hidden-lg">Assets</span>
                        <span class="hidden-xs"><i class="fa fa-barcode fa-lg"></i></span>
@@ -109,7 +109,7 @@
 
                    <th data-sortable="true" data-field="activated" data-formatter="trueFalseFormatter">{{ trans('general.activated') }}</th>
                    <th data-sortable="true" data-field="created_at" data-searchable="true" data-visible="false" data-formatter="createdAtFormatter">{{ trans('general.created_at') }}</th>
-                   <th data-switchable="false" data-searchable="false" data-sortable="false" data-formatter="actionsFormatter" data-field="actions" >{{ trans('table.actions') }}</th>
+                   <th data-switchable="false" data-searchable="false" data-sortable="false" data-formatter="usersActionsFormatter" data-field="actions" >{{ trans('table.actions') }}</th>
                  </tr>
                </thead>
              </table>
@@ -136,15 +136,5 @@
     }
 
 
-    function actionsFormatter(value, row) {
-        return '<nobr><a href="{{ url('/') }}/users/' + row.id + '/edit" class="btn btn-sm btn-warning"><i class="fa fa-pencil"></i></a> '
-            + '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
-            + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
-            + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
-            + '<i class="fa fa-trash"></i></a></nobr>';
-
-    }
-
-
 </script>
 @stop