diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index 2cf0960c9b..e33290a4cc 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -24,83 +24,155 @@
 {{-- Page content --}}
 @section('content')
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-default">
-      <div class="box-body">
-          @if ($category->category_type=='asset')
-            @include('partials.asset-bulk-actions')
-          @endif
 
-        <table
 
-                @if ($category->category_type=='asset')
+    <div class="row">
+        <div class="col-md-12">
 
-                  data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="categoryAssetsTable"
-                  id="categoryAssetsTable"
-                  data-id-table="categoryAssetsTable"
-                  data-export-options='{
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs">
+                    <li class="active">
+                        <a href="#items" data-toggle="tab" title="{{ trans('general.items') }}">{{ trans('general.'.$category->category_type) }}
+                            @if ($category->category_type=='asset')
+                            <badge class="badge badge-secondary"> {{ $category->assets->count() }}</badge>
+                            @endif
+                        </a>
+                    </li>
+                    @if ($category->category_type=='asset')
+                    <li>
+                        <a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}
+                            <badge class="badge badge-secondary"> {{ $category->models->count()}}</badge>
+                        </a>
+                    </li>
+                   @endif
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane fade in active" id="items">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="table-responsive">
+                                    @if ($category->category_type=='asset')
+                                        @include('partials.asset-bulk-actions')
+                                    @endif
+
+                                    <table
+
+                                            @if ($category->category_type=='asset')
+
+                                            data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="categoryAssetsTable"
+                                            id="categoryAssetsTable"
+                                            data-id-table="categoryAssetsTable"
+                                            data-toolbar="#assetsBulkEditToolbar"
+                                            data-bulk-button-id="#bulkAssetEditButton"
+                                            data-bulk-form-id="#assetsBulkForm"
+                                            data-export-options='{
                     "fileName": "export-{{ str_slug($category->name) }}-assets-{{ date('Y-m-d') }}",
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'
-                @elseif ($category->category_type=='accessory')
-                  data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="categoryAccessoryTable"
-                  id="categoryAccessoryTable"
-                  data-id-table="categoryAccessoryTable"
-                  data-export-options='{
+                                            @elseif ($category->category_type=='accessory')
+                                                data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="categoryAccessoryTable"
+                                            id="categoryAccessoryTable"
+                                            data-id-table="categoryAccessoryTable"
+                                            data-export-options='{
                       "fileName": "export-{{ str_slug($category->name) }}-accessories-{{ date('Y-m-d') }}",
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                       }'
-                @elseif ($category->category_type=='consumable')
-                  data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
-                  data-cookie-id-table="categoryConsumableTable"
-                  id="categoryConsumableTable"
-                  data-id-table="categoryConsumableTable"
-                  data-export-options='{
+                                            @elseif ($category->category_type=='consumable')
+                                                data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="categoryConsumableTable"
+                                            id="categoryConsumableTable"
+                                            data-id-table="categoryConsumableTable"
+                                            data-export-options='{
                       "fileName": "export-{{ str_slug($category->name) }}-consumables-{{ date('Y-m-d') }}",
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                       }'
-                @elseif ($category->category_type=='component')
-                  data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="categoryCompomnentTable"
-                  id="categoryCompomnentTable"
-                  data-id-table="categoryCompomnentTable"
-                  data-export-options='{
+                                            @elseif ($category->category_type=='component')
+                                                data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="categoryCompomnentTable"
+                                            id="categoryCompomnentTable"
+                                            data-id-table="categoryCompomnentTable"
+                                            data-export-options='{
                       "fileName": "export-{{ str_slug($category->name) }}-components-{{ date('Y-m-d') }}",
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                       }'
-                @elseif ($category->category_type=='license')
-                data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
-                data-cookie-id-table="categoryLicenseTable"
-                id="categoryLicenseTable"
-                data-id-table="categoryLicenseTable"
-                data-export-options='{
+                                            @elseif ($category->category_type=='license')
+                                                data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="categoryLicenseTable"
+                                            id="categoryLicenseTable"
+                                            data-id-table="categoryLicenseTable"
+                                            data-export-options='{
                       "fileName": "export-{{ str_slug($category->name) }}-licenses-{{ date('Y-m-d') }}",
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                       }'
-                @endif
+                                            @endif
 
-                data-pagination="true"
-                data-search="true"
-                data-show-footer="true"
-                data-side-pagination="server"
-                data-show-columns="true"
-                data-show-export="true"
-                data-show-refresh="true"
-                data-sort-order="asc"
-                class="table table-striped snipe-table"
-                data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}">
-            
-      </table>
+                                            data-pagination="true"
+                                            data-search="true"
+                                            data-show-footer="true"
+                                            data-side-pagination="server"
+                                            data-show-columns="true"
+                                            data-show-export="true"
+                                            data-show-refresh="true"
+                                            data-sort-order="asc"
+                                            class="table table-striped snipe-table"
+                                            data-url="{{ route('api.'.$category_type_route.'.index',['category_id'=> $category->id]) }}">
 
-      </div>
-    </div>
-  </div>
-</div>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="tab-pane fade" id="models">
+                        <div class="row">
+                            <div class="col-md-12">
+
+                                @if ($category->models->count() > 0)
+                                    @if ($category->category_type=='asset')
+                                        @include('partials.models-bulk-actions')
+                                    @endif
+                                @endif
+
+                                    <table
+                                            data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="asssetModelsTable"
+                                            data-pagination="true"
+                                            data-id-table="asssetModelsTable"
+                                            data-search="true"
+                                            data-show-footer="true"
+                                            data-side-pagination="server"
+                                            data-show-columns="true"
+                                            data-toolbar="#modelsBulkEditToolbar"
+                                            data-bulk-button-id="#bulkModelsEditButton"
+                                            data-bulk-form-id="#modelsBulkForm"
+                                            data-show-export="true"
+                                            data-show-refresh="true"
+                                            data-sort-order="asc"
+                                            id="asssetModelsTable"
+                                            class="table table-striped snipe-table"
+                                            data-url="{{ route('api.models.index', ['status' => request('status')]) }}"
+                                            data-export-options='{
+              "fileName": "export-models-{{ date('Y-m-d') }}",
+              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+              }'>
+                                    </table>
+
+                            </div>
+                        </div>
+                    </div>
+
+                </div> <!-- .tab-content-->
+            </div> <!-- .nav-tabs-custom -->
+        </div> <!-- .col-md-12> -->
+    </div> <!-- .row -->
 @stop
 
+
+
+
+
 @section('moar_scripts')
 @include ('partials.bootstrap-table')
 @stop