diff --git a/app/config/version.php b/app/config/version.php
index 7c1795ab94..bda9aa6457 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6-26',
-  'hash_version' => 'v1.2.6-26-gbb33e3c',
+  'app_version' => 'v1.2.6.1-6',
+  'hash_version' => 'v1.2.6.1-6-g84affba',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 2ba19820b5..617868adc9 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -882,7 +882,7 @@ class AssetsController extends AdminController
     {
         //return Datatable::collection(Asset::all(array('id', 'name', 'asset_tag', 'serial')))
 
-       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->Hardware();
+       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model')->Hardware();
         // Filter results
         if (Input::get('Pending')) {
         	$assets->Pending();
@@ -901,15 +901,37 @@ class AssetsController extends AdminController
         }
 
         $assets = $assets->orderBy('asset_tag', 'ASC')->get();
-
+        
+        
         return Datatable::collection($assets)
-        ->showColumns('name', 'asset_tag', 'serial')
-        ->searchColumns('name', 'asset_tag', 'serial')
+        ->addColumn('name',function($assets)
+	        {
+	            return '<a href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
+	        })	
+	        
+        ->showColumns('asset_tag', 'serial')
+         	        
+	    ->addColumn('status',function($assets)
+	        {
+	            return '<a href="foo">'.$assets->assetstatus->name.'</a>';
+	        })	
+	        	        
+		->addColumn('model',function($assets)
+			{
+			    return $assets->model->name;
+			})	
+			
+			->addColumn('eol',function($assets)
+			{
+			    return $assets->eol_date();
+			})	
+		
+	            
+	    ->showColumns('checkedout_on')
+        ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkedout_on')
         ->orderColumns('name', 'asset_tag', 'serial')
         ->make();
-    }
-
-
-
+        
+		}
 
 }
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 7d4b830afd..373527e049 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -165,6 +165,13 @@ class Asset extends Depreciable
     {
         return $this->belongsTo('Supplier','supplier_id');
     }
+    
+    // FIXME
+    public function category()
+    {
+        return $this->belongsTo('Category','category_id');
+    }
+    
 
     public function months_until_eol()
     {
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 90dcc7fa1a..ec9f18b769 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -52,14 +52,22 @@
 
 
 {{ Datatable::table()
-    ->addColumn('name', 'asset_tag', 'serial', 'assigned_to')       // these are the column headings to be shown
+    ->addColumn('name', 'asset_tag', 'serial', 'status','model','eol','checkedout_on')
     ->setUrl(route('api.hardware'))   // this is the route where data will be retrieved
+    ->setOptions(
+            array(
+                'dom' =>'C<"clear">lfrtip',
+            )
+        )
     ->render() }}
 
  {{ Form::close() }}
 
 </div>
 <script>
+	
+
+
 	$(function() {
 
 	    $('input.one_required').change(function() {