diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index 047cd76c5f..ef27dd782b 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -43,6 +43,7 @@ class ComponentsTransformer
             ] : null,
             'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
+            'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
         ];
 
         $permissions_array['available_actions'] = [
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index 7a547bb44f..533b05b812 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -85,17 +85,29 @@ class ComponentPresenter extends Presenter
                 "sortable" => true,
                 "title" => trans('general.purchase_cost'),
                 "visible" => true,
-            ], [
-                "field" => "actions",
-                "searchable" => false,
-                "sortable" => false,
-                "switchable" => false,
-                "title" => trans('table.actions'),
-                "visible" => true,
-                "formatter" => "componentsActionsFormatter",
-            ]
+            ],
         ];
 
+        $layout[] = [
+            "field" => "checkincheckout",
+            "searchable" => false,
+            "sortable" => false,
+            "switchable" => true,
+            "title" => 'Checkin/Checkout',
+            "visible" => true,
+            "formatter" => "componentsInOutFormatter",
+        ];
+
+        $layout[] = [
+            "field" => "actions",
+            "searchable" => false,
+            "sortable" => false,
+            "switchable" => false,
+            "title" => trans('table.actions'),
+            "formatter" => "componentsActionsFormatter",
+        ];
+
+
         return json_encode($layout);
     }