diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index ef27dd782b..f80124e1db 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -58,12 +58,22 @@ class ComponentsTransformer
     }
 
 
-    public function transformCheckedoutComponents(Collection $components_users, $total)
+    public function transformCheckedoutComponents(Collection $components_assets, $total)
     {
         $array = array();
-        foreach ($components_users as $user) {
-            $array[] = (new UsersTransformer)->transformUser($user);
+        foreach ($components_assets as $asset) {
+            $array[] = [
+                'assigned_pivot_id' => $asset->pivot->id,
+                'id' => (int) $asset->id,
+                'name' =>  e($asset->model->present()->name) .' '.e($asset->present()->name),
+                'qty' => $asset->pivot->assigned_qty,
+                'type' => 'asset',
+                'created_at' => Helper::getFormattedDateObject($asset->pivot->created_at, 'datetime'),
+                'available_actions' => ['checkin' => true]
+            ];
+
         }
+
         return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 }
diff --git a/app/Models/Component.php b/app/Models/Component.php
index a59448db9a..8dfc27b56b 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -64,7 +64,7 @@ class Component extends SnipeModel
 
     public function assets()
     {
-        return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('assigned_qty', 'created_at', 'user_id');
+        return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id');
     }
 
     public function admin()
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 533b05b812..b9493ab996 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -120,5 +120,14 @@ class ComponentPresenter extends Presenter
         return (string) link_to_route('consumables.show', e($this->name), $this->id);
     }
 
+    /**
+     * Url to view this item.
+     * @return string
+     */
+    public function viewUrl()
+    {
+        return route('accessories.show', $this->id);
+    }
+
 
 }