diff --git a/app/config/version.php b/app/config/version.php
index be403a9ffe..ff417fc368 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-8',
-  'hash_version' => 'v1.2.6.1-8-gb2af862',
+  'app_version' => 'v1.2.6.1-9',
+  'hash_version' => 'v1.2.6.1-9-g7559f58',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 1e49479d5c..fffaf7f77f 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -905,11 +905,10 @@ class AssetsController extends AdminController
         $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) 
         	{ 
 	        	if ($assets->deleted_at=='') {
-             		return '<a href="'.route('update/hardware', $assets->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', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
-	        	} else {
-	                if ($asset->model->deleted_at=='') {
+             		return '<a href="'.route('update/hardware', $assets->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', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+	        	} elseif ($asset->model->deleted_at!='') {
 	        		 	return '<a href="'.route('restore/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
-	                }
+	                
 	        	}
         	
 	        });
@@ -930,7 +929,7 @@ class AssetsController extends AdminController
         return Datatable::collection($assets)
         ->addColumn('name',function($assets)
 	        {
-	            return '<a href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
+		        return link_to('hardware/'.$assets->id.'/view', $assets->name);
 	        })	
 	        
         ->showColumns('asset_tag', 'serial')
@@ -938,7 +937,7 @@ class AssetsController extends AdminController
 	    ->addColumn('status',function($assets)
 	        {	
 		        	if ($assets->assigned_to!='') {
-			        	return '<a href="../users/'.$assets->assigned_to.'/view">'.$assets->assigneduser->fullName().'</a> ';
+			        	return link_to('../users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
 			        } else {
 				        return $assets->assetstatus->name;				        
 			        }
@@ -964,8 +963,8 @@ class AssetsController extends AdminController
 	        })	
 		->addColumn($inout)     
 	    ->addColumn($actions)           
-        ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkedout_on')
-        ->orderColumns('name', 'asset_tag', 'serial')
+        ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date')
+        ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date')
         ->make();
         
 		}
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index a7635a8424..730561efcb 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -62,6 +62,7 @@
     	Lang::get('admin/hardware/table.change'), 
     	Lang::get('table.actions'))
     ->setUrl(route('api.hardware'))   // this is the route where data will be retrieved
+    ->setOptions('deferRender', 'true')
     ->setOptions(
             array(
                 'dom' =>'C<"clear">lfrtip',