diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php
index 472343e56e..0ffeb6e9b3 100755
--- a/app/controllers/admin/CategoriesController.php
+++ b/app/controllers/admin/CategoriesController.php
@@ -298,12 +298,23 @@ class CategoriesController extends AdminController
 
       foreach ($category_assets as $asset) {
 
+        $actions = '';
         if ($asset->deleted_at=='') {
             $actions = '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $asset->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($asset->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-        } elseif ($asset->model->deleted_at=='') {
+        } elseif ($asset->deleted_at!='') {
             $actions = '<a href="'.route('restore/hardware', $asset->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
         }
 
+        if ($asset->assetstatus) {
+            if ($asset->assetstatus->deployable != 0) {
+                if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) {
+                    $inout = '<a href="'.route('checkin/hardware', $asset->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            }
+        }
+
         $rows[] = array(
           'id' => $asset->id,
           'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()),
@@ -311,6 +322,7 @@ class CategoriesController extends AdminController
           'asset_tag' => $asset->asset_tag,
           'serial' => $asset->serial,
           'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '',
+          'change' => $inout,
           'actions' => $actions,
 
 
diff --git a/app/views/backend/categories/view.blade.php b/app/views/backend/categories/view.blade.php
index 35afffb62b..4c30c4658a 100644
--- a/app/views/backend/categories/view.blade.php
+++ b/app/views/backend/categories/view.blade.php
@@ -42,13 +42,14 @@
   data-cookie-id-table="categoryAssetsTable">
       <thead>
           <tr>
-              <th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{Lang::get('general.id')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="name">{{Lang::get('general.name')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="model">{{Lang::get('admin/hardware/form.model')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="asset_tag">{{Lang::get('general.asset_tag')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="serial">{{Lang::get('admin/hardware/form.serial')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="assigned_to">{{Lang::get('general.user')}}</th>
-              <th data-searchable="false" data-sortable="false" data-field="actions"  data-switchable="false">{{Lang::get('table.actions')}}</th>
+              <th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">@lang('general.id')</th>
+              <th data-searchable="false" data-sortable="false" data-field="name">@lang('general.name')</th>
+              <th data-searchable="false" data-sortable="false" data-field="model">@lang('admin/hardware/form.model')</th>
+              <th data-searchable="false" data-sortable="false" data-field="asset_tag">@lang('general.asset_tag')</th>
+              <th data-searchable="false" data-sortable="false" data-field="serial">@lang('admin/hardware/form.serial')</th>
+              <th data-searchable="false" data-sortable="false" data-field="assigned_to">@lang('general.user')</th>
+              <th data-searchable="false" data-sortable="false" data-field="change"  data-switchable="false">@lang('admin/hardware/table.change')</th>
+              <th data-searchable="false" data-sortable="false" data-field="actions"  data-switchable="false">@lang('table.actions')</th>
           </tr>
       </thead>
   </table>