diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 5f9ec8723d00..f46efa72663c 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -131,9 +131,12 @@ public static function icon($type) {
                 return 'fa-regular fa-clipboard';
             case 'paperclip':
                 return 'fas fa-paperclip';
+            case 'contact-card':
+                return 'fa-regular fa-id-card';
             case 'files':
                 return 'fa-regular fa-file';
             case 'more-info':
+            case 'support':
                 return 'far fa-life-ring';
             case 'calendar':
                 return 'fas fa-calendar';
@@ -144,7 +147,7 @@ public static function icon($type) {
             case 'more-files':
                 return 'fa-solid fa-laptop-file';
             case 'maintenances':
-                return 'fas fa-wrench';
+                return 'fa-solid fa-screwdriver-wrench';
             case 'seats':
                 return 'far fa-list-alt';
             case 'globe-us':
@@ -203,6 +206,12 @@ public static function icon($type) {
                 return 'fa-solid fa-lightbulb';
             case 'highlight':
                 return 'fa-solid fa-highlighter';
+            case 'manager':
+                return 'fa-solid fa-building-user';
+            case 'company':
+                return 'fa-regular fa-building';
+            case 'parent':
+                return 'fa-solid fa-building-flag';
         }
     }
 }
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 8257f9babcd0..57e03bb4241b 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -22,6 +22,13 @@ public static function dataTableLayout()
                 'title' => trans('general.id'),
                 'visible' => false,
                 'printIgnore' => true,
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'formatter' => 'accessoriesLinkFormatter',
             ], [
                 'field' => 'image',
                 'searchable' => false,
@@ -38,14 +45,7 @@ public static function dataTableLayout()
                 'title' => trans('admin/companies/table.title'),
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
-            ], [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('general.name'),
-                'formatter' => 'accessoriesLinkFormatter',
-            ], [
+            ],  [
                 'field' => 'category',
                 'searchable' => true,
                 'sortable' => true,
@@ -172,6 +172,7 @@ public static function dataTableLayout()
                 'visible' => true,
                 'title' => trans('general.change'),
                 'formatter' => 'accessoriesInOutFormatter',
+                'printIgnore' => true,
             ], [
                 'field' => 'available_actions',
                 'searchable' => false,
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index f29c473663fe..9a5e354c55af 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -21,6 +21,13 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'componentsLinkFormatter',
             ],
             [
                 'field' => 'company',
@@ -31,14 +38,7 @@ public static function dataTableLayout()
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
             ],
-            [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'title' => trans('general.name'),
-                'visible' => true,
-                'formatter' => 'componentsLinkFormatter',
-            ], [
+             [
                 'field' => 'image',
                 'searchable' => false,
                 'sortable' => true,
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index 2b2eec5b2ee4..8c7cf1d0d9ca 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -21,17 +21,7 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-            ],
-            [
-                'field' => 'company',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.company'),
-                'visible' => false,
-                'formatter' => 'companiesLinkObjFormatter',
-            ],
-            [
+            ], [
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
@@ -39,7 +29,16 @@ public static function dataTableLayout()
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'consumablesLinkFormatter',
+            ], [
+                'field' => 'company',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => false,
+                'formatter' => 'companiesLinkObjFormatter',
             ],
+
             [
                 'field' => 'image',
                 'searchable' => false,
@@ -172,6 +171,7 @@ public static function dataTableLayout()
                 'visible' => true,
                 'title' => trans('general.change'),
                 'formatter' => 'consumablesInOutFormatter',
+                'printIgnore' => true,
             ], [
                 'field' => 'actions',
                 'searchable' => false,
diff --git a/app/Presenters/DepartmentPresenter.php b/app/Presenters/DepartmentPresenter.php
index cdce1d967d5e..ea3d051d4f74 100644
--- a/app/Presenters/DepartmentPresenter.php
+++ b/app/Presenters/DepartmentPresenter.php
@@ -22,17 +22,7 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
-            ],
-            [
-                'field' => 'company',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => true,
-                'title' => trans('general.company'),
-                'visible' => false,
-                'formatter' => 'companiesLinkObjFormatter'
-            ],
-            [
+            ], [
                 'field' => 'name',
                 'searchable' => true,
                 'sortable' => true,
@@ -40,6 +30,14 @@ public static function dataTableLayout()
                 'title' => trans('general.name'),
                 'visible' => true,
                 'formatter' => 'departmentsLinkFormatter',
+            ], [
+                'field' => 'company',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => false,
+                'formatter' => 'companiesLinkObjFormatter'
             ], [
                 'field' => 'image',
                 'searchable' => false,
@@ -112,6 +110,7 @@ public static function dataTableLayout()
                 'title' => trans('table.actions'),
                 'visible' => true,
                 'formatter' => 'departmentsActionsFormatter',
+                'printIgnore' => true,
             ],
         ];
 
diff --git a/app/Presenters/GroupPresenter.php b/app/Presenters/GroupPresenter.php
new file mode 100644
index 000000000000..cf2a8915480c
--- /dev/null
+++ b/app/Presenters/GroupPresenter.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class GroupPresenter
+ */
+class GroupPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'visible' => true,
+                'formatter' => 'groupsAdminLinkFormatter',
+            ],
+            [
+                'field' => 'users_count',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' =>  trans('admin/groups/table.users'),
+                'visible' => true,
+                'class' => 'css-users',
+            ],  [
+                'field' => 'notes',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => true,
+                'title' => trans('general.notes'),
+            ], [
+                'field' => 'created_by',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => true,
+                'formatter' => 'usersLinkObjFormatter',
+            ],  [
+                'field' => 'updated_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.updated_at'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'visible' => true,
+                'formatter' => 'groupsActionsFormatter',
+                'printIgnore' => true,
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+    
+}
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index 7fc1aa5682d6..87972c4e5a12 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -21,6 +21,13 @@ public static function dataTableLayout()
                 'switchable' => true,
                 'title' => trans('general.id'),
                 'visible' => false,
+            ],  [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('general.name'),
+                'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'company',
                 'searchable' => true,
@@ -29,13 +36,6 @@ public static function dataTableLayout()
                 'title' => trans('admin/companies/table.title'),
                 'visible' => false,
                 'formatter' => 'companiesLinkObjFormatter',
-            ], [
-                'field' => 'name',
-                'searchable' => true,
-                'sortable' => true,
-                'switchable' => false,
-                'title' => trans('general.name'),
-                'formatter' => 'licensesLinkFormatter',
             ], [
                 'field' => 'product_key',
                 'searchable' => true,
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index ab739e871bf3..460bdb81dfd3 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -333,6 +333,7 @@ public static function assignedAccessoriesDataTableLayout()
                 'switchable' => false,
                 'title' => trans('table.actions'),
                 'formatter' => 'accessoriesInOutFormatter',
+                'printIgnore' => true,
             ],
         ];
 
diff --git a/app/Presenters/Presenter.php b/app/Presenters/Presenter.php
index 13bae66ecdf9..dc50f5406a89 100644
--- a/app/Presenters/Presenter.php
+++ b/app/Presenters/Presenter.php
@@ -21,6 +21,35 @@ public function __construct(SnipeModel $model)
         $this->model = $model;
     }
 
+    public function displayAddress() {
+        $address = '';
+        if ($this->model->address) {
+            $address .= e($this->model->address)."\n";
+        }
+
+        if ($this->model->address2) {
+            $address .= e($this->model->address2)."\n";
+        }
+
+        if ($this->model->city) {
+            $address .= e($this->model->city).', ';
+        }
+
+        if ($this->model->state) {
+            $address .= e($this->model->state).' ';
+        }
+
+        if ($this->model->zip) {
+            $address .= e($this->model->zip).' ';
+        }
+
+        if ($this->model->country) {
+            $address .= e($this->model->country).' ';
+        }
+
+        return $address;
+    }
+
     // Convenience functions for datatables stuff
     public function categoryUrl()
     {
@@ -70,30 +99,7 @@ public function manufacturerUrl()
         return '';
     }
 
-//    public function name()
-//    {
-//        return $this->model->name;
-//    }
-//
-//    public function display_name()
-//    {
-//        return $this->model->display_name;
-//    }
-
-
-//    protected function displayName(): Attribute
-//    {
-//        // This override should only kick in if the model has a display_name prope
-//        if ($this->getRawOriginal('display_name')) {
-//            return Attribute:: make (
-//                get: fn(mixed $value) => 'Poop:'.$this->display_name
-//            );
-//        }
-//
-//        return Attribute:: make(
-//            get: fn(mixed $value) => 'Fart: '.$this->name,
-//        );
-//    }
+
 
     public function __get($property)
     {
@@ -108,4 +114,6 @@ public function __call($method, $args)
     {
         return $this->model->$method($args);
     }
+
+
 }
diff --git a/app/Presenters/SupplierPresenter.php b/app/Presenters/SupplierPresenter.php
index 9ac0fcc0fa76..dd9d87d733c4 100644
--- a/app/Presenters/SupplierPresenter.php
+++ b/app/Presenters/SupplierPresenter.php
@@ -3,7 +3,7 @@
 namespace App\Presenters;
 
 /**
- * Class LocationPresenter
+ * Class SupplierPresenter
  */
 class SupplierPresenter extends Presenter
 {
diff --git a/app/Presenters/UploadedFilesPresenter.php b/app/Presenters/UploadedFilesPresenter.php
index 83b528d38724..9a2d548cbcf9 100644
--- a/app/Presenters/UploadedFilesPresenter.php
+++ b/app/Presenters/UploadedFilesPresenter.php
@@ -92,6 +92,7 @@ public static function dataTableLayout()
                 'title' => trans('table.actions'),
                 'visible' => true,
                 'formatter' => 'deleteUploadFormatter',
+                'printIgnore' => true,
             ],
         ];
 
diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php
index bc6d61d96899..93c41612fe9e 100644
--- a/app/Providers/BreadcrumbsServiceProvider.php
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -458,7 +458,8 @@ public function boot()
 
         Breadcrumbs::for('manufacturers.edit', fn (Trail $trail, Manufacturer $manufacturer) =>
         $trail->parent('manufacturers.index', route('manufacturers.index'))
-            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
+            ->push($manufacturer->name, route('manufacturers.show', $manufacturer))
+            ->push(trans('general.update', ['name' => $manufacturer->name]), route('manufacturers.edit', $manufacturer))
         );
 
 
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index ed6201355bb0..6c45d6bf2e4a 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -100,7 +100,9 @@
     'created_at' 			=> 'Created At',
     'created_by'            => 'Created By',
     'record_created' 		=> 'Record Created',
-    'updated_at' 			=> 'Updated at',
+    'updated_at' 			=> 'Updated At',
+    'updated_plain' 		=> 'Updated',
+    'created_plain' 		=> 'Created',
     'currency'  			=> '$', // this is deprecated
     'currency_text'  		=> 'Currency', //
     'current'  				=> 'Current',
diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php
index 1bc038662e18..5f6763382878 100755
--- a/resources/views/accessories/index.blade.php
+++ b/resources/views/accessories/index.blade.php
@@ -9,37 +9,25 @@
 
 {{-- Page content --}}
 @section('content')
-
-<div class="row">
-  <div class="col-md-12">
-
-    <div class="box box-default">
-      <div class="box-body">
-
-            <table
-                data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
-                data-cookie-id-table="accessoriesTable"
-                data-id-table="accessoriesTable"
-                data-side-pagination="server"
-                data-show-footer="true"
-                data-sort-order="asc"
-                data-footer-style="footerStyle"
-                id="accessoriesTable"
-                data-buttons="accessoryButtons"
-                class="table table-striped snipe-table"
-                data-url="{{route('api.accessories.index') }}"
-                data-export-options='{
-                    "fileName": "export-accessories-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                    }'>
-          </table>
-      </div>
-    </div>
-  </div>
-</div>
-
+    <x-container>
+        <x-box>
+
+            <x-table
+                    show_column_search="false"
+                    show_footer="true"
+                    buttons="accessoryButtons"
+                    fixed_right_number="2"
+                    fixed_number="1"
+                    api_url="{{ route('api.accessories.index') }}"
+                    :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"
+                    export_filename="export-accessories-{{ date('Y-m-d') }}"
+            />
+
+        </x-box>
+    </x-container>
 @stop
 
+
 @section('moar_scripts')
 @include ('partials.bootstrap-table')
 @stop
diff --git a/resources/views/blade/box/body.blade.php b/resources/views/blade/box/body.blade.php
deleted file mode 100644
index cc95fb01f365..000000000000
--- a/resources/views/blade/box/body.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Start box-body component -->
-<div class="box-body">
-    {{ $slot }}
-</div>
\ No newline at end of file
diff --git a/resources/views/blade/box/contact.blade.php b/resources/views/blade/box/contact.blade.php
new file mode 100644
index 000000000000..1972a164f359
--- /dev/null
+++ b/resources/views/blade/box/contact.blade.php
@@ -0,0 +1,160 @@
+@props([
+    'contact' => null,
+    'img_path' => null,
+])
+
+<div class="box-body box-profile">
+
+    <h3 class="profile-username">
+    @if (($contact->image) && ($img_path))
+            <a href="{{ Storage::disk('public')->url($img_path.e($contact->image)) }}" data-toggle="lightbox" data-type="image">
+                <img src="{{ Storage::disk('public')->url($img_path.e($contact->image)) }}" class="profile-user-img img-responsive img-thumbnail" alt="{{ $contact->name }}">
+            </a>
+    @endif
+
+
+        {{ $contact->display_name }}
+    </h3>
+
+        @if ($contact->present()->displayAddress)
+            {!! nl2br($contact->present()->displayAddress) !!}
+            <br><br>
+        @endif
+
+
+    @if (isset($before_list))
+        {{ $before_list }}
+    @endif
+
+    <ul class="list-group list-group-unbordered">
+
+        {{ $slot }}
+
+        @if ($contact->company)
+            <x-info-element icon_type="company">
+                {{ $contact->company->display_name }}
+            </x-info-element>
+        @endif
+
+
+        <x-info-element icon_type="contact-card">
+            {{ $contact->contact }}
+        </x-info-element>
+
+        @if ($contact->manager)
+            <x-info-element icon_type="manager">
+               {{ $contact->manager->display_name }}
+            </x-info-element>
+        @endif
+
+        @if ($contact->parent)
+            <x-info-element icon_type="parent">
+                {{ $contact->parent->display_name }}
+            </x-info-element>
+        @endif
+
+        <x-info-element icon_type="email">
+            <x-info-element.email>
+                {{ $contact->email }}
+            </x-info-element.email>
+        </x-info-element>
+
+        @if ($contact->phone)
+            <x-info-element icon_type="phone">
+                <x-info-element.phone>
+                    {{ $contact->phone }}
+                </x-info-element.phone>
+            </x-info-element>
+        @endif
+
+        @if ($contact->fax)
+            <x-info-element icon_type="fax">
+                <x-info-element.phone>
+                    {{ $contact->fax }}
+                </x-info-element.phone>
+            </x-info-element>
+        @endif
+
+        <x-info-element icon_type="external-link">
+            <x-info-element.url>
+                {{ $contact->url }}
+            </x-info-element.url>
+        </x-info-element>
+
+        <x-info-element icon_type="external-link">
+            <x-info-element.url>
+                {{ $contact->support_url }}
+            </x-info-element.url>
+        </x-info-element>
+
+        @if ($contact->notes)
+            <x-info-element>
+                <i class="fa fa-note-sticky fa-fw"></i>
+                {!! nl2br(Helper::parseEscapedMarkedownInline($contact->notes)) !!}
+            </x-info-element>
+        @endif
+
+        @if (($contact->present()->displayAddress) && (config('services.google.maps_api_key')))
+
+                <x-info-element>
+                    <div class="text-center">
+                        <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($contact->address.','.$contact->city.' '.$contact->state.' '.$contact->country.' '.$contact->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail img-responsive" style="width: 100%" alt="Map">
+                    </div>
+                </x-info-element>
+        @endif
+
+        @if ((($contact->address!='') && ($contact->city!='')) || ($contact->state!='') || ($contact->country!=''))
+            <x-info-element>
+                <a class="btn btn-sm btn-theme" href="https://maps.google.com/?q={{ urlencode($contact->address.','. $contact->city.','.$contact->state.','.$contact->country.','.$contact->zip) }}" target="_blank">
+                    {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}
+                    <x-icon type="external-link"/>
+                </a>
+
+                <a class="btn btn-sm btn-theme"  href="https://maps.apple.com/?q={{ urlencode($contact->address.','. $contact->city.','.$contact->state.','.$contact->country.','.$contact->zip) }}" target="_blank">
+                    {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true"></i>']) !!}
+                    <x-icon type="external-link"/>
+                </a>
+            </x-info-element>
+        @endif
+
+        @if ($contact->created_by)
+            <x-info-element>
+                <span class="text-muted">
+                    <x-icon type="user" class="fa-fw" />
+                    {{ trans('general.created_by') }}
+                    {{ $contact->adminuser->display_name }}
+                </span>
+            </x-info-element>
+        @endif
+
+
+        @if ($contact->created_at)
+            <x-info-element>
+                <span class="text-muted">
+                    <x-icon type="calendar" class="fa-fw" />
+                    {{ trans('general.created_plain') }}
+                    {{ $contact->created_at }}
+                </span>
+            </x-info-element>
+        @endif
+
+        @if ($contact->updated_at)
+            <x-info-element>
+                <span class="text-muted">
+                    <x-icon type="calendar" class="fa-fw" />
+                    {{ trans('general.updated_plain') }}
+                    {{ $contact->updated_at }}
+                </span>
+            </x-info-element>
+        @endif
+
+
+    </ul>
+    @if (isset($after_list))
+        {{ $after_list }}
+    @endif
+
+</div>
+
+
+
diff --git a/resources/views/blade/box/header.blade.php b/resources/views/blade/box/header.blade.php
deleted file mode 100644
index 0c54adb5fbd1..000000000000
--- a/resources/views/blade/box/header.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Start box-header component -->
-<div class="box-header with-border">
-    <h2 class="box-title">
-        {{ $slot }}
-    </h2>
-</div>
\ No newline at end of file
diff --git a/resources/views/blade/box/index.blade.php b/resources/views/blade/box/index.blade.php
index 81527e6c2a69..745772f73a9b 100644
--- a/resources/views/blade/box/index.blade.php
+++ b/resources/views/blade/box/index.blade.php
@@ -3,23 +3,32 @@
     'header' => false,
     'footer' => false,
 ])
+@aware(['name', 'route'])
+
 
 <!-- Start box component -->
 <div class="box box-{{ $box_style }}">
 
     @if ($header)
-    <x-box.header>
-        {{ $header }}
-    </x-box.header>
+        <div class="box-header with-border">
+            <h2 class="box-title">
+                {{ $header }}
+            </h2>
+        </div>
     @endif
 
     <div class="box-body">
+
+        @if (isset($bulkactions))
+            <div id="{{ Illuminate\Support\Str::camel($name) }}ToolBar" class="pull-left" style="min-width:500px !important; padding-top: 10px;">
+                {{ $bulkactions }}
+            </div>
+        @endif
+
         {{ $slot }}
     </div>
 
-    @if ($footer)
-        <x-box.footer>
-        {{ $footer }}
-        </x-box.footer>
+    @if ($route)
+        <x-box.footer />
     @endif
 </div>
\ No newline at end of file
diff --git a/resources/views/blade/form/index.blade.php b/resources/views/blade/form/index.blade.php
new file mode 100644
index 000000000000..4ff9b739e79d
--- /dev/null
+++ b/resources/views/blade/form/index.blade.php
@@ -0,0 +1,18 @@
+@props([
+    'route' => null,
+    'item' => null,
+    'class' => 'form-horizontal',
+])
+@aware(['name', 'footer'])
+
+<form id="create-form" class="{{ $class }}" method="post" action="{{ $route }}" autocomplete="off" role="form" enctype="multipart/form-data">
+
+    @csrf
+
+    @if ($item->id)
+        {{ method_field('PUT') }}
+    @endif
+
+    {{ $slot }}
+
+</form>
\ No newline at end of file
diff --git a/resources/views/blade/info-element/email.blade.php b/resources/views/blade/info-element/email.blade.php
new file mode 100644
index 000000000000..958d4e7077cc
--- /dev/null
+++ b/resources/views/blade/info-element/email.blade.php
@@ -0,0 +1,3 @@
+@if (!$slot->isEmpty())
+    <a href="mailto:{{ $slot }}">{{ $slot }}</a>
+@endif
\ No newline at end of file
diff --git a/resources/views/blade/info-element/index.blade.php b/resources/views/blade/info-element/index.blade.php
new file mode 100644
index 000000000000..ec9e27adedb3
--- /dev/null
+++ b/resources/views/blade/info-element/index.blade.php
@@ -0,0 +1,15 @@
+@props([
+    'icon' => null,
+    'icon_type' => null,
+])
+
+@if (!$slot->isEmpty())
+    <li {{ $attributes->merge(['class' => 'list-group-item']) }}>
+        @if ($icon_type)
+            <x-icon type="{{ $icon_type }}" class="fa-fw" />
+        @elseif ($icon)
+           <i class="{{ $icon }}"></i>
+        @endif
+        {{ $slot }}
+    </li>
+@endif
\ No newline at end of file
diff --git a/resources/views/blade/info-element/phone.blade.php b/resources/views/blade/info-element/phone.blade.php
new file mode 100644
index 000000000000..9decf4755035
--- /dev/null
+++ b/resources/views/blade/info-element/phone.blade.php
@@ -0,0 +1,3 @@
+@if (!$slot->isEmpty())
+    <a href="tel:{{ $slot }}">{{ $slot }}</a>
+@endif
diff --git a/resources/views/blade/info-element/url.blade.php b/resources/views/blade/info-element/url.blade.php
new file mode 100644
index 000000000000..1df76894bdc6
--- /dev/null
+++ b/resources/views/blade/info-element/url.blade.php
@@ -0,0 +1,3 @@
+@if (!$slot->isEmpty())
+<a href="{{ $slot }}" target="_new"> {{ $slot }}</a>
+@endif
diff --git a/resources/views/components/tables/bulk-actions.blade.php b/resources/views/blade/table/bulk-actions.blade.php
similarity index 73%
rename from resources/views/components/tables/bulk-actions.blade.php
rename to resources/views/blade/table/bulk-actions.blade.php
index 807cd76882e5..5b7a82d5fd89 100644
--- a/resources/views/components/tables/bulk-actions.blade.php
+++ b/resources/views/blade/table/bulk-actions.blade.php
@@ -1,19 +1,16 @@
 @props([
-        'id_divname',
-        'id_formname',
-        'id_button',
         'action_route',
-        'action_method',
         'model_name' => 'asset',
     ])
+@aware(['name'])
 
-<div id="{{ $id_divname }}" style="min-width:400px">
+<div id="{{ Illuminate\Support\Str::camel($name) }}Form" style="min-width:400px">
     <form
             method="POST"
             action="{{ $action_route }}"
             accept-charset="UTF-8"
             class="form-inline"
-            id="{{  $id_formname }}"
+            id="{{ Illuminate\Support\Str::camel($name) }}Form"
     >
         @csrf
 
@@ -29,7 +26,6 @@ class="form-inline"
             {{ $slot }}
         </select>
 
-        <button class="btn btn-theme" id="{{ $id_button }}"
-                disabled>{{ trans('button.go') }}</button>
+        <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>
     </form>
 </div>
\ No newline at end of file
diff --git a/resources/views/blade/bulk-menus/assets.blade.php b/resources/views/blade/table/bulk-assets.blade.php
similarity index 100%
rename from resources/views/blade/bulk-menus/assets.blade.php
rename to resources/views/blade/table/bulk-assets.blade.php
diff --git a/resources/views/blade/table/bulk-models.blade.php b/resources/views/blade/table/bulk-models.blade.php
new file mode 100644
index 000000000000..4b4e52fe3934
--- /dev/null
+++ b/resources/views/blade/table/bulk-models.blade.php
@@ -0,0 +1,31 @@
+@aware(['name'])
+
+
+    <form
+            method="POST"
+            action="{{route('models.bulkedit.index')}}"
+            accept-charset="UTF-8"
+            class="form-inline"
+            id="{{ Illuminate\Support\Str::camel($name) }}Form"
+    >
+        @csrf
+        @if (request('status')!='deleted')
+            @can('view', \App\Models\AssetModel::class)
+                <div style="width:100% !important;">
+                    <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
+                    <select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">
+                        @can('delete', \App\Models\AssetModel::class)
+                            <option value="edit">{{ trans('general.bulk_edit') }}</option>
+                        @endcan
+                        @can('delete', \App\Models\AssetModel::class)
+                            <option value="delete">{{ trans('general.bulk_delete') }}</option>
+                        @endcan
+                    </select>
+                    <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>
+                </div>
+            @endcan
+        @endif
+    </form>
+
+
+
diff --git a/resources/views/blade/table/bulk-users.blade.php b/resources/views/blade/table/bulk-users.blade.php
new file mode 100644
index 000000000000..6d7f668b0bc3
--- /dev/null
+++ b/resources/views/blade/table/bulk-users.blade.php
@@ -0,0 +1,38 @@
+@aware(['name'])
+
+<form
+        method="POST"
+        action="{{ route('users/bulkedit') }}"
+        accept-charset="UTF-8"
+        class="form-inline"
+        id="{{ Illuminate\Support\Str::camel($name) }}Form"
+>
+    @csrf
+
+    <div style="width:100% !important;">
+        {{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}
+        <input name="sort" type="hidden" value="users.id">
+        <input name="order" type="hidden" value="asc">
+        <label for="bulk_actions">
+            <span class="sr-only">
+                {{ trans('button.bulk_actions') }}
+            </span>
+        </label>
+        <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 350px !important;">
+            @can('update', \App\Models\User::class)
+                <option value="edit">{{ trans('general.bulk_edit') }}</option>
+                <option value="send_assigned">{{ trans('admin/users/general.email_assigned') }}</option>
+            @endcan
+
+            @can('delete', \App\Models\User::class)
+                <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>
+                <option value="merge">{!! trans('general.merge_users') !!}</option>
+            @endcan
+
+            <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
+            <option value="print">{{ trans('admin/users/general.print_assigned') }}</option>
+        </select>
+
+        <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>
+    </div>
+</form>
diff --git a/resources/views/blade/table.blade.php b/resources/views/blade/table/index.blade.php
similarity index 58%
rename from resources/views/blade/table.blade.php
rename to resources/views/blade/table/index.blade.php
index c6ecea6496f9..58a549f03b84 100644
--- a/resources/views/blade/table.blade.php
+++ b/resources/views/blade/table/index.blade.php
@@ -5,6 +5,12 @@
     'api_url' => null,
     'show_column_search' => false,
     'show_advanced_search' => false,
+    'fixed_number' => false,
+    'fixed_right_number' => false,
+    'show_footer' => false,
+    'sort_order' => 'asc',
+    'sort_field' => 'name',
+
 ])
 
 @aware(['name'])
@@ -14,25 +20,42 @@
     class="table table-striped snipe-table"
     data-cookie-id-table="{{ $name }}ListingTable"
     data-id-table="{{ $name }}ListingTable"
-    data-sort-order="asc"
+    data-sort-order="{{ $sort_order }}"
     data-toolbar="#{{ Illuminate\Support\Str::camel($name) }}Toolbar"
     data-bulk-button-id="#{{ Illuminate\Support\Str::camel($name) }}Button"
     data-bulk-form-id="#{{ Illuminate\Support\Str::camel($name) }}Form"
     id="{{ $name }}ListingTable"
     data-show-columns-search="{{ $show_column_search }}"
     data-show-advanced-search="{{ $show_advanced_search }}"
+
     @if ($presenter)
         data-columns="{{ $presenter }}"
     @endif
+
+    @if ($fixed_number)
+        data-fixed-number="{{ $fixed_number }}"
+    @endif
+
+    @if ($fixed_right_number)
+        data-fixed-right-number="{{ $fixed_right_number }}"
+    @endif
+
     @if ($buttons)
         data-buttons="{{ $buttons }}"
     @endif
+
+    @if ($show_footer)
+        data-show-footer="{{ $show_footer }}"
+        data-footer-style="footerStyle"
+    @endif
+
     @if ($api_url)
         data-side-pagination="server"
-        data-url="{{ $api_url }}"
+        data-url="{!! $api_url !!}"
     @endif
+
     data-export-options='{
-      "fileName": "{{ $export_filename }}",
-      "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-}'>
+        "fileName": "{{ $export_filename }}",
+        "ignoreColumn": ["actions","available_actions", "image","change","checkbox","checkincheckout","icon"]
+    }'>
 </table>
\ No newline at end of file
diff --git a/resources/views/blade/tabs/nav-item.blade.php b/resources/views/blade/tabs/nav-item.blade.php
index 803bc25d3024..24d2f67e3876 100644
--- a/resources/views/blade/tabs/nav-item.blade.php
+++ b/resources/views/blade/tabs/nav-item.blade.php
@@ -1,14 +1,15 @@
 @props([
-    'name' => false,
-    'label' => false,
+    'name' => null,
+    'label' => null,
     'count' => 0,
-    'icon' => false,
-    'icon_style' => false,
-    'tooltip' => false,
+    'icon' => null,
+    'icon_style' => null,
+    'tooltip' => null,
 ])
 <!-- start tab nav item -->
 <li {{ $attributes->merge(['class' => '']) }}>
-    <a href="#{{ $name ?? 'info' }}" data-toggle="tab"{!! ($tooltip) ? ' data-tooltip="true" title="'.$tooltip.'"' : '' !!}>
+
+    <a href="#{{ $name ?? 'info' }}" data-toggle="tab" data-tooltip="true" title="{{ $tooltip ?? $label }}">
 
         @if ($icon)
 
@@ -28,8 +29,6 @@
             {{ $label }}
         @endif
 
-
-
         @if ($count > 0)
             <span class="badge">{{ number_format($count) }}</span>
         @endif
diff --git a/resources/views/blade/tabs/pane.blade.php b/resources/views/blade/tabs/pane.blade.php
index 6fd9685cdf6b..4139080618f1 100644
--- a/resources/views/blade/tabs/pane.blade.php
+++ b/resources/views/blade/tabs/pane.blade.php
@@ -6,10 +6,9 @@
 <div id="{{ $name }}" {{ $attributes->merge(['class' => 'tab-pane fade']) }}  style="min-height: 400px !important;">
 
     @if (isset($header))
-        <h2 class="box-title{{ (!isset($bulkactions)) ? 'pull-left' : '' }}">
+        <h2 class="box-title{{ (!isset($bulkactions)) ? ' pull-left' : '' }}">
             {{ $header }}
         </h2>
-
     @endif
 
     @if (isset($bulkactions))
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index 4e39def44d94..df83e366ffe0 100755
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -6,46 +6,35 @@
 @parent
 @stop
 
+
 {{-- Page content --}}
 @section('content')
     <x-container>
         <x-box>
 
-          <x-tables.bulk-actions
-                  id_divname='categoriesBulkEditToolbar'
-                  action_route="{{route('categories.bulk.delete')}}"
-                  id_formname="categoriesBulkForm"
-                  id_button="bulkCategoryEditButton"
-                  model_name="category"
-          >
-              @can('delete', App\Models\Category::class)
-                  <option>Delete</option>
-              @endcan
-          </x-tables.bulk-actions>
+            <x-slot:bulkactions>
+                <x-table.bulk-actions
+                    name='category'
+                    action_route="{{route('categories.bulk.delete')}}"
+                    model_name="category"
+                >
+                @can('delete', App\Models\Category::class)
+                    <option>Delete</option>
+                @endcan
+                </x-table.bulk-actions>
+            </x-slot:bulkactions>
 
-          <table
-                  data-columns="{{ \App\Presenters\CategoryPresenter::dataTableLayout() }}"
-            data-cookie-id-table="categoryTable"
-            data-id-table="categoryTable"
-            data-side-pagination="server"
-            data-sort-order="asc"
-            id="categoryTable"
-            {{-- begin stuff for bulk dropdown --}}
-            data-toolbar="#categoriesBulkEditToolbar"
-            data-bulk-button-id="#bulkCategoryEditButton"
-            data-bulk-form-id="#categoriesBulkForm"
-            {{-- end stuff for bulk dropdown --}}
-            data-buttons="categoryButtons"
-            class="table table-striped snipe-table"
-            data-url="{{ route('api.categories.index') }}"
-            data-export-options='{
-              "fileName": "export-categories-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
+            <x-table
+                    name="category"
+                    buttons="categoryButtons"
+                    fixed_right_number="1"
+                    fixed_number="1"
+                    api_url="{{ route('api.categories.index') }}"
+                    :presenter="\App\Presenters\CategoryPresenter::dataTableLayout()"
+                    export_filename="export-categories-{{ date('Y-m-d') }}"
+            />
         </x-box>
     </x-container>
-
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/components/index.blade.php b/resources/views/components/index.blade.php
index 2b3cb884504e..2a304457e2e7 100644
--- a/resources/views/components/index.blade.php
+++ b/resources/views/components/index.blade.php
@@ -9,33 +9,23 @@
 
 {{-- Page content --}}
 @section('content')
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-default">
-      <div class="box-body">
-        <table
-                data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
-                data-cookie-id-table="componentsTable"
-                data-id-table="componentsTable"
-                data-side-pagination="server"
-                data-footer-style="footerStyle"
-                data-show-footer="true"
-                data-sort-order="asc"
-                data-sort-name="name"
-                id="componentsTable"
-                data-buttons="componentButtons"
-                class="table table-striped snipe-table"
-                data-url="{{ route('api.components.index') }}"
-                data-export-options='{
-                "fileName": "export-components-{{ date('Y-m-d') }}",
-                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                }'>
-        </table>
-      </div><!-- /.box-body -->
-    </div><!-- /.box -->
-  </div>
-</div>
-
+    <x-container>
+        <x-box>
+
+            <x-table
+                    show_column_search="false"
+                    show_advanced_search="true"
+                    show_footer="true"
+                    buttons="componentButtons"
+                    fixed_right_number="2"
+                    fixed_number="1"
+                    api_url="{{ route('api.components.index') }}"
+                    :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"
+                    export_filename="export-components-{{ date('Y-m-d') }}"
+            />
+
+        </x-box>
+    </x-container>
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/consumables/index.blade.php b/resources/views/consumables/index.blade.php
index 070647562425..6ccb59049eaa 100644
--- a/resources/views/consumables/index.blade.php
+++ b/resources/views/consumables/index.blade.php
@@ -11,25 +11,17 @@
     <x-container>
         <x-box>
 
-        <table
-                data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
-                data-cookie-id-table="consumablesTable"
-                data-id-table="consumablesTable"
-                data-side-pagination="server"
-                data-footer-style="footerStyle"
-                data-show-footer="true"
-                data-sort-order="asc"
-                data-sort-name="name"
-                data-toolbar="#toolbar"
-                id="consumablesTable"
-                data-buttons="consumableButtons"
-                class="table table-striped snipe-table"
-                data-url="{{ route('api.consumables.index') }}"
-                data-export-options='{
-                "fileName": "export-consumables-{{ date('Y-m-d') }}",
-                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                }'>
-        </table>
+            <x-table
+                    show_column_search="false"
+                    show_advanced_search="true"
+                    show_footer="true"
+                    buttons="consumableButtons"
+                    fixed_right_number="2"
+                    fixed_number="1"
+                    api_url="{{ route('api.consumables.index') }}"
+                    :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"
+                    export_filename="export-consumables-{{ date('Y-m-d') }}"
+            />
 
         </x-box>
     </x-container>
diff --git a/resources/views/departments/index.blade.php b/resources/views/departments/index.blade.php
index 3c56cf973051..65249a8d49ea 100644
--- a/resources/views/departments/index.blade.php
+++ b/resources/views/departments/index.blade.php
@@ -10,29 +10,20 @@
 @section('content')
     <x-container>
         <x-box>
-
-            <table
-                    data-columns="{{ \App\Presenters\DepartmentPresenter::dataTableLayout() }}"
-                    data-cookie-id-table="departmentsTable"
-                    data-id-table="departmentsTable"
-                    data-side-pagination="server"
-                    data-sort-order="asc"
-                    id="departmentsTable"
-                    data-advanced-search="false"
-                    data-buttons="departmentButtons"
-                    class="table table-striped snipe-table"
-                    data-url="{{ route('api.departments.index') }}"
-                    data-export-options='{
-                  "fileName": "export-departments-{{ date('Y-m-d') }}",
-                  "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                  }'>
-            </table>
-
+            <x-table
+                    show_column_search="false"
+                    buttons="departmentButtons"
+                    fixed_right_number="1"
+                    fixed_number="1"
+                    api_url="{{ route('api.departments.index') }}"
+                    :presenter="\App\Presenters\DepartmentPresenter::dataTableLayout()"
+                    export_filename="export-departments-{{ date('Y-m-d') }}"
+            />
         </x-box>
     </x-container>
-
 @stop
 
+
 @section('moar_scripts')
     @include ('partials.bootstrap-table')
 
diff --git a/resources/views/depreciations/index.blade.php b/resources/views/depreciations/index.blade.php
index 86365b6e17c7..d07ec5ed6bab 100755
--- a/resources/views/depreciations/index.blade.php
+++ b/resources/views/depreciations/index.blade.php
@@ -6,34 +6,22 @@
 @parent
 @stop
 
+
 {{-- Page content --}}
 @section('content')
     <x-container>
-
-        <x-page-column>
-            <x-box>
-              <table
-                  data-columns="{{ \App\Presenters\DepreciationPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="depreciationsTable"
-                  data-id-table="depreciationsTable"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="depreciationsTable"
-                  data-advanced-search="false"
-                  data-buttons="depreciationButtons"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.depreciations.index') }}"
-                  data-export-options='{
-                    "fileName": "export-depreciations-{{ date('Y-m-d') }}",
-                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                    }'>
-              </table>
-
-            </x-box>
-        </x-page-column>
-
+        <x-box>
+            <x-table
+                    show_column_search="false"
+                    buttons="depreciationButtons"
+                    fixed_right_number="1"
+                    fixed_number="1"
+                    api_url="{{ route('api.depreciations.index') }}"
+                    :presenter="\App\Presenters\DepreciationPresenter::dataTableLayout()"
+                    export_filename="export-depreciations-{{ date('Y-m-d') }}"
+            />
+        </x-box>
     </x-container>
-
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
index c235563b3553..d45cf414b8e1 100755
--- a/resources/views/groups/index.blade.php
+++ b/resources/views/groups/index.blade.php
@@ -15,35 +15,17 @@
 @section('content')
     <x-container>
         <x-box>
-            <table
-                data-cookie-id-table="groupsTable"
-                data-side-pagination="server"
-                data-sort-order="asc"
-                data-sort-name="name"
-                id="groupsTable"
-                data-buttons="groupButtons"
-                class="table table-striped snipe-table"
-                data-url="{{ route('api.groups.index') }}"
-                data-export-options='{
-        "fileName": "export-groups-{{ date('Y-m-d') }}",
-            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-            }'>
 
-            <thead>
-              <tr>
-               <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-               <th data-switchable="true" data-sortable="true" data-field="name" data-formatter="groupsAdminLinkFormatter" data-visible="true">{{ trans('admin/groups/table.name') }}</th>
-                  <th data-switchable="true" data-sortable="true" data-field="users_count" data-visible="true"><x-icon type="user" /><span class="sr-only">{{ trans('admin/groups/table.users') }}</span></th>
-                  <th data-switchable="true" data-sortable="true" data-field="notes" data-visible="true">{{ trans('general.notes') }}</th>
-                  <th data-switchable="true" data-sortable="true" data-field="created_at" data-visible="true" data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
-               <th data-switchable="false" data-searchable="false" data-sortable="true" data-field="created_by"  data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                  <th data-switchable="false" data-searchable="false" data-sortable="true" data-field="created_at"  data-formatter="dateDisplayFormatter">{{ trans('general.created_at') }}</th>
-                  <th data-switchable="false" data-searchable="false" data-sortable="true" data-field="updated_at"  data-formatter="dateDisplayFormatter">{{ trans('general.updated_at') }}</th>
-                  <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"   data-formatter="groupsActionsFormatter">{{ trans('table.actions') }}</th>
-
-              </tr>
-            </thead>
-          </table>
+            <x-table
+                    name="groups"
+                    buttons="groupButtons"
+                    fixed_right_number="1"
+                    fixed_number="1"
+                    api_url="{{ route('api.groups.index') }}"
+                    :presenter="\App\Presenters\GroupPresenter::dataTableLayout()"
+                    export_filename="export-groups-{{ date('Y-m-d') }}"
+            />
+            
         </x-box>
     </x-container>
 @stop
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 23dc3074bcb7..53c725c17d1f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -121,12 +121,18 @@
 
         .label2_fields,
         .l2fd-main,
-        .l2fd-listitem
+        .l2fd-listitem,
+        .fixed-table-loading,
+        .list-group-item
         {
             background-color: var(--box-bg) !important;
             color: var(--color-fg) !important;
         }
 
+        .list-group-item {
+            border: var(--tab-bottom-border);
+        }
+
         footer.main-footer {
             color: var(--main-footer-text-color) !important;
             background-color: var(--main-footer-bg-color) !important;
@@ -419,6 +425,8 @@
             border-top:  var(--box-header-top-border);
         }
 
+
+
         .box-header.with-border {
             border-bottom: var(--box-header-bottom-border);
         }
@@ -894,6 +902,10 @@
             color: white !important;
         }
 
+        .box.box-theme {
+            border-top:  var(--main-theme-color) !important;
+        }
+
     </style>
 
     {{-- Custom CSS --}}
diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php
index 2793210d0fed..919bbb9dcc4a 100755
--- a/resources/views/licenses/index.blade.php
+++ b/resources/views/licenses/index.blade.php
@@ -12,23 +12,17 @@
     <x-container>
         <x-box>
 
-          <table
-              data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
-              data-cookie-id-table="licensesTable"
-              data-side-pagination="server"
-              data-footer-style="footerStyle"
-              data-show-footer="true"
-              data-sort-order="asc"
-              data-sort-name="name"
-              id="licensesTable"
-              data-buttons="licenseButtons"
-              class="table table-striped snipe-table"
-              data-url="{{ route('api.licenses.index', ['status' => e(request('status'))]) }}"
-              data-export-options='{
-            "fileName": "export-licenses-{{ date('Y-m-d') }}",
-            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-            }'>
-          </table>
+            <x-table
+                    show_column_search="false"
+                    show_advanced_search="true"
+                    show_footer="true"
+                    buttons="licenseButtons"
+                    fixed_right_number="2"
+                    fixed_number="1"
+                    api_url="{{ route('api.licenses.index', ['status' => e(request('status'))]) }}"
+                    :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"
+                    export_filename="export-licenses-{{ date('Y-m-d') }}"
+            />
 
         </x-box>
     </x-container>
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 48ba45f2f070..0772a0783797 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -32,7 +32,7 @@ class="active"
                       <x-tabs.nav-item
                               name="assets"
                               icon="fa-solid fa-house-laptop fa-fw"
-                              label="{{ trans('general.users') }}"
+                              label="{{ trans('general.assets') }}"
                               count="{{ $location->assets()->AssetsForShow()->count() }}"
                               tooltip="{{ trans('admin/locations/message.current_location') }}"
                       />
@@ -140,7 +140,7 @@ class="active"
                       </x-slot:header>
 
                       <x-slot:bulkactions>
-                      @include('partials.users-bulk-actions')
+                          <x-table.bulk-users />
                       </x-slot:bulkactions>
 
                       <x-slot:content>
@@ -168,7 +168,7 @@ class="active"
                       </x-slot:header>
 
                       <x-slot:bulkactions>
-                         <x-bulk-menus.assets />
+                         <x-table.bulk-assets />
                       </x-slot:bulkactions>
 
                       <x-slot:content>
@@ -195,7 +195,7 @@ class="active"
                       </x-slot:header>
 
                       <x-slot:bulkactions>
-                          <x-bulk-menus.assets />
+                          <x-table.bulk-assets />
                       </x-slot:bulkactions>
 
                       <x-slot:content>
@@ -220,7 +220,7 @@ class="active"
                       </x-slot:header>
 
                       <x-slot:bulkactions>
-                          <x-bulk-menus.assets />
+                          <x-table.bulk-assets />
                       </x-slot:bulkactions>
 
                       <x-slot:content>
@@ -369,132 +369,76 @@ class="active"
         </x-page-column>
         <x-page-column class="col-md-3">
 
-      @if ($location->image!='')
-          <div class="col-md-12 text-center" style="padding-bottom: 17px;">
-              <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" style="width:100%" alt="{{ $location->name }}">
-          </div>
-      @endif
-
-      @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
-          <div class="col-md-12 text-center" style="padding-bottom: 10px;">
-              <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($location->address.','.$location->city.' '.$location->state.' '.$location->country.' '.$location->zip) }}&size=700x500&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-thumbnail" style="width:100%" alt="Map">
-          </div>
-      @endif
-
-      <div class="col-md-12">
-
-          <ul class="list-unstyled" style="line-height: 22px; padding-bottom: 20px;">
-
-              @if ($location->notes)
-                  <li>
-                      <strong>{{ trans('general.notes') }}</strong>:
-                      {!! nl2br(Helper::parseEscapedMarkedownInline($location->notes)) !!}
-                  </li>
-              @endif
-
-              @if ($location->address!='')
-                  <li>{{ $location->address }}</li>
-              @endif
-              @if ($location->address2!='')
-                  <li>{{ $location->address2 }}</li>
-              @endif
-              @if (($location->city!='') || ($location->state!='') || ($location->zip!=''))
-                  <li>{{ $location->city }} {{ $location->state }} {{ $location->zip }}</li>
-              @endif
-              @if ($location->manager)
-                  <li><strong>{{ trans('admin/users/table.manager') }}</strong>: {!! $location->manager->present()->nameUrl() !!}</li>
-              @endif
-              @if ($location->company)
-                  <li><strong>{{ trans('admin/companies/table.name') }}</strong>: {!! $location->company->present()->nameUrl() !!}</li>
-              @endif
-              @if ($location->parent)
-                  <li><strong>{{ trans('admin/locations/table.parent') }}</strong>: {!! $location->parent->present()->nameUrl() !!}</li>
-              @endif
-              @if ($location->ldap_ou)
-                  <li><strong>{{ trans('admin/locations/table.ldap_ou') }}</strong>: {{ $location->ldap_ou }}</li>
-              @endif
-
-
-              @if ((($location->address!='') && ($location->city!='')) || ($location->state!='') || ($location->country!=''))
-                      <li>
-                        <a href="https://maps.google.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
-                            {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-google" aria-hidden="true"></i>']) !!}
-                            <x-icon type="external-link"/>
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://maps.apple.com/?q={{ urlencode($location->address.','. $location->city.','.$location->state.','.$location->country.','.$location->zip) }}" target="_blank">
-                            {!! trans('admin/locations/message.open_map', ['map_provider_icon' => '<i class="fa-brands fa-apple" aria-hidden="true" style="font-size: 18px"></i>']) !!}
-                            <x-icon type="external-link"/></a>
-                  </li>
-              @endif
-
-          </ul>
-      </div>
-
-      @can('update', $location)
-          @if ($location->deleted_at=='')
-              <div class="col-md-12">
-                  <a href="{{ route('locations.edit', ['location' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-warning btn-social">
-                      <x-icon type="edit" />
-                      {{ trans('admin/locations/table.update') }}
-                  </a>
-              </div>
-              @else
-              <div class="col-md-12">
-                  <a style="width: 100%;" class="btn btn-sm btn-warning btn-social disabled">
-                      <x-icon type="edit" />
-                      {{ trans('admin/locations/table.update') }}
-                  </a>
-              </div>
-              @endif
-      @endcan
-
-     @if ($location->deleted_at=='')
-      <div class="col-md-12" style="padding-top: 5px;">
-          <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">
-              <x-icon type="print" />
-              {{ trans('admin/locations/table.print_inventory') }}
-          </a>
-      </div>
-      <div class="col-md-12" style="padding-top: 5px;">
-          <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" style="width: 100%;" class="btn btn-sm btn-theme btn-social hidden-print">
-              <x-icon type="print" />
-              {{ trans('admin/locations/table.print_all_assigned') }}
-          </a>
-      </div>
-      @endif
-
-          @can('delete', $location)
-              <div class="col-md-12 hidden-print" style="padding-top: 10px;">
-
-            @if ($location->deleted_at=='')
-
-                @if ($location->isDeletable())
-                      <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">
-                          <x-icon type="delete" />
-                          {{ trans('general.delete') }}
-                      </button>
-                @else
-                      <span data-placement="top" data-tooltip="true" data-title="{{ trans('admin/locations/message.assoc_users') }}">
-                          <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">
-                          <x-icon type="delete" />
-                          {{ trans('general.delete') }}
-                      </a>
-                          </span>
-                @endif
-
-            @else
-                  <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">
-                      @csrf
-                      <button class="btn btn-sm btn-block btn-warning btn-social">
-                          <x-icon type="restore" />
-                          {{ trans('general.restore') }}
-                      </button>
-                  </form>
-            @endif
-              </div>
-    @endcan
+            <x-box>
+                <x-box.contact :contact="$location" img_path="{{ app('locations_upload_url') }}">
+
+                    <x-slot:before_list>
+                        @can('update', $location)
+                            @if ($location->deleted_at=='')
+                                    <a href="{{ route('locations.edit', ['location' => $location->id]) }}" class="btn btn-block btn-sm btn-warning btn-social">
+                                        <x-icon type="edit" />
+                                        {{ trans('admin/locations/table.update') }}
+                                    </a>
+                            @else
+                                    <a class="btn btn-block btn-sm btn-warning btn-social disabled">
+                                        <x-icon type="edit" />
+                                        {{ trans('admin/locations/table.update') }}
+                                    </a>
+                            @endif
+                        @endcan
+
+                        @if ($location->deleted_at=='')
+                                <a href="{{ route('locations.print_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">
+                                    <x-icon type="print" />
+                                    {{ trans('admin/locations/table.print_inventory') }}
+                                </a>
+
+                                <a href="{{ route('locations.print_all_assigned', ['locationId' => $location->id]) }}" class="btn btn-block btn-sm btn-theme btn-social hidden-print">
+                                    <x-icon type="print" />
+                                    {{ trans('admin/locations/table.print_all_assigned') }}
+                                </a>
+
+                        @endif
+
+                        @can('delete', $location)
+
+                                @if ($location->deleted_at=='')
+                                    @if ($location->isDeletable())
+                                        <button class="btn btn-sm btn-block btn-danger btn-social delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $location->name]) }}" data-target="#dataConfirmModal">
+                                            <x-icon type="delete" /> {{ trans('general.delete') }}
+                                        </button>
+                                    @else
+                                        <div data-placement="top" data-tooltip="true" data-title="{{ trans('admin/locations/message.assoc_users') }}" style="padding-top: 5px; padding-bottom: 5px;">
+                                              <a href="#" class="btn btn-block btn-sm btn-danger btn-social hidden-print disabled" data-tooltip="true">
+                                                <x-icon type="delete" /> {{ trans('general.delete') }}
+                                              </a>
+                                        </div>
+                                    @endif
+
+                                @else
+                                    <form method="POST" action="{{ route('locations.restore', ['location' => $location->id]) }}">
+                                        @csrf
+                                        <button class="btn btn-sm btn-block btn-warning btn-social">
+                                            <x-icon type="restore" />
+                                            {{ trans('general.restore') }}
+                                        </button>
+                                    </form>
+                                @endif
+                            </div>
+                        @endcan
+
+                    </x-slot:before_list>
+
+
+                @if ($location->ldap_ou)
+                        <x-info-element icon_type="ldap">
+                            {{ $location->ldap_ou }}
+                        </x-info-element>
+                    @endif
+
+
+                </x-box.contact>
+            </x-box>
 
         </x-page-column>
     </x-container>
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 1e092ab7ee82..7f9d37d7073a 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -1,112 +1,117 @@
-@extends('layouts/edit-form', [
-    'createText' => trans('admin/manufacturers/table.create') ,
-    'updateText' => trans('admin/manufacturers/table.update'),
-    'helpTitle' => trans('admin/manufacturers/table.about_manufacturers_title'),
-    'helpText' => trans('admin/manufacturers/table.about_manufacturers_text'),
-    'formAction' => (isset($item->id)) ? route('manufacturers.update', ['manufacturer' => $item->id]) : route('manufacturers.store'),
-])
+@extends('layouts/default')
 
+{{-- Page title --}}
+@section('title')
+    {{ trans('general.manufacturers') }}
+@stop
 
 {{-- Page content --}}
-@section('inputFields')
-
-    <!-- Name -->
-    <x-form-row
-            :label="trans('admin/manufacturers/table.name')"
-            :$item
-            name="name"
-    />
-
-    <!-- URL -->
-    <x-form-row
-            :label="trans('general.url')"
-            :$item
-            name="url"
-            type="url"
-            input_icon="link"
-            input_group_addon="left"
-            placeholder="https://example.com"
-    />
-
-
-
-    <!-- Support URL -->
-    <x-form-row
-            :label="trans('admin/manufacturers/table.support_url')"
-            :$item
-            name="support_url"
-            type="url"
-            input_icon="link"
-            input_group_addon="left"
-            placeholder="https://example.com"
-    />
-
-
-
-    <!-- Warranty Lookup URL -->
-    <x-form-row
-            :label="trans('admin/manufacturers/table.warranty_lookup_url')"
-            :$item
-            name="warranty_lookup_url"
-            type="url"
-            help_text="{!! trans('admin/manufacturers/message.support_url_help') !!}"
-            input_icon="link"
-            input_group_addon="left"
-            placeholder="https://example.com"
-    />
-
-    <!-- Support Phone -->
-    <x-form-row
-            :label="trans('admin/manufacturers/table.support_phone')"
-            :$item
-            name="support_phone"
-            input_div_class="col-md-6"
-            type="tel"
-            input_icon="phone"
-            input_group_addon="left"
-            placeholder="1-800-555-5555"
-    />
-
-
-    <!-- Support Email -->
-    <x-form-row
-            :label="trans('admin/manufacturers/table.support_email')"
-            :$item
-            name="support_email"
-            input_div_class="col-md-6"
-            type="email"
-            input_icon="email"
-            input_group_addon="left"
-            placeholder="support@example.com"
-    />
-
-
-@include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])
-
-
-    <!-- Notes -->
-    <x-form-row
-            :label="trans('general.notes')"
-            :$item
-            name="notes"
-            type="textarea"
-            placeholder="{{ trans('general.placeholders.notes') }}"
-    />
-
-    <fieldset name="color-preferences">
-        <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
-            {{ trans('general.tag_color') }}
-        </x-form-legend>
-        <!--  color -->
-        <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
-            <label for="tag_color" class="col-md-3 control-label">
-                {{ trans('general.tag_color') }}
-            </label>
-            <div class="col-md-9">
-                <x-input.colorpicker :item="$item" id="color" :value="old('color', ($item->color ?? '#f4f4f4'))" name="tag_color" id="tag_color" />
-                {!! $errors->first('tag_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-            </div>
-        </div>
-    </fieldset>
+@section('content')
+
+    <x-container class="col-md-6 col-md-offset-3">
+
+        <x-form :$item route="{{ (isset($item->id)) ? route('manufacturers.update', ['manufacturer' => $item->id]) : route('manufacturers.store')  }}">
+
+        <x-box>
+
+                <!-- Name -->
+                <x-form-row
+                        :label="trans('admin/manufacturers/table.name')"
+                        :$item
+                        name="name"
+                />
+
+                <!-- URL -->
+                <x-form-row
+                        :label="trans('general.url')"
+                        :$item
+                        name="url"
+                        type="url"
+                        input_icon="link"
+                        input_group_addon="left"
+                        placeholder="https://example.com"
+                />
+
+                <!-- Support URL -->
+                <x-form-row
+                        :label="trans('admin/manufacturers/table.support_url')"
+                        :$item
+                        name="support_url"
+                        type="url"
+                        input_icon="link"
+                        input_group_addon="left"
+                        placeholder="https://example.com"
+                />
+
+                <!-- Warranty Lookup URL -->
+                <x-form-row
+                        :label="trans('admin/manufacturers/table.warranty_lookup_url')"
+                        :$item
+                        name="warranty_lookup_url"
+                        type="url"
+                        help_text="{!! trans('admin/manufacturers/message.support_url_help') !!}"
+                        input_icon="link"
+                        input_group_addon="left"
+                        placeholder="https://example.com"
+                />
+
+                <!-- Support Phone -->
+                <x-form-row
+                        :label="trans('admin/manufacturers/table.support_phone')"
+                        :$item
+                        name="support_phone"
+                        input_div_class="col-md-6"
+                        type="tel"
+                        input_icon="phone"
+                        input_group_addon="left"
+                        placeholder="1-800-555-5555"
+                />
+
+
+                <!-- Support Email -->
+                <x-form-row
+                        :label="trans('admin/manufacturers/table.support_email')"
+                        :$item
+                        name="support_email"
+                        input_div_class="col-md-6"
+                        type="email"
+                        input_icon="email"
+                        input_group_addon="left"
+                        placeholder="support@example.com"
+                />
+
+
+            @include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])
+
+
+                <!-- Notes -->
+                <x-form-row
+                        :label="trans('general.notes')"
+                        :$item
+                        name="notes"
+                        type="textarea"
+                        placeholder="{{ trans('general.placeholders.notes') }}"
+                />
+
+                <fieldset name="color-preferences">
+                    <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+                        {{ trans('general.tag_color') }}
+                    </x-form-legend>
+                    <!--  color -->
+                    <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
+                        <label for="tag_color" class="col-md-3 control-label">
+                            {{ trans('general.tag_color') }}
+                        </label>
+                        <div class="col-md-9">
+                            <x-input.colorpicker :item="$item" id="color" :value="old('color', ($item->color ?? '#f4f4f4'))" name="tag_color" id="tag_color" />
+                            {!! $errors->first('tag_color', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                        </div>
+                    </div>
+                </fieldset>
+            </x-box>
+
+        </x-form>
+</x-container>
+
 
 @stop
diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php
index cc2041c9d413..da4e16effc3b 100755
--- a/resources/views/manufacturers/index.blade.php
+++ b/resources/views/manufacturers/index.blade.php
@@ -26,41 +26,33 @@
                     </form>
 
               @else
-                        <x-tables.bulk-actions
-                                id_divname='manufacturersBulkEditToolbar'
-                                action_route="{{route('manufacturers.bulk.delete')}}"
-                                id_formname="manufacturersBulkForm"
-                                id_button="bulkManufacturerEditButton"
-                                model_name="manufacturer"
-                        >
-                            @can('delete', App\Models\Manufacturer::class)
-                                <option>{{trans('general.delete')}}</option>
-                            @endcan
-                        </x-tables.bulk-actions>
+                <x-slot:bulkactions>
+                    <x-table.bulk-actions
+                            name='manufacturer'
+                            action_route="{{route('manufacturers.bulk.delete')}}"
+                            model_name="manufacturer"
+                    >
+                        @can('delete', App\Models\Manufacturer::class)
+                            <option>Delete</option>
+                        @endcan
+                    </x-table.bulk-actions>
+                </x-slot:bulkactions>
 
-                    <table
-                      data-columns="{{ \App\Presenters\ManufacturerPresenter::dataTableLayout() }}"
-                      data-cookie-id-table="manufacturersTable"
-                      data-id-table="manufacturersTable"
-                      data-advanced-search="false"
-                      data-side-pagination="server"
-                      data-sort-order="asc"
-                      id="manufacturersTable"
-                      {{-- begin stuff for bulk dropdown --}}
-                      data-toolbar="#manufacturersBulkEditToolbar"
-                      data-bulk-button-id="#bulkManufacturerEditButton"
-                      data-bulk-form-id="#manufacturersBulkForm"
-                      {{-- end stuff for bulk dropdown --}}
-                      data-buttons="manufacturerButtons"
-                      class="table table-striped snipe-table"
-                      data-url="{{route('api.manufacturers.index', ['status' => e(request()->input('status')) ]) }}"
-                      data-export-options='{
-                        "fileName": "export-manufacturers-{{ date('Y-m-d') }}",
-                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                        }'>
-                    </table>
 
-                    @endif
+                <x-table
+                        name="manufacturer"
+                        buttons="manufacturerButtons"
+                        fixed_right_number="1"
+                        fixed_number="1"
+                        api_url="{{ route('api.manufacturers.index') }}"
+                        :presenter="\App\Presenters\ManufacturerPresenter::dataTableLayout()"
+                        export_filename="export-manufacturers-{{ date('Y-m-d') }}"
+                />
+
+
+
+
+            @endif
         </x-box>
     </x-container>
 @stop
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 3054e311e398..569eb37c2eb9 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -9,206 +9,195 @@
 @stop
 
 @section('header_right')
-
-  <a href="{{ route('manufacturers.index') }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.back') }}</a>
-
-
-  <div class="btn-group pull-right">
-     <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
-     <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><a href="{{ route('manufacturers.edit', $manufacturer->id) }}">{{ trans('admin/manufacturers/table.update') }}</a></li>
-        <li><a href="{{ route('manufacturers.create') }}">{{ trans('admin/manufacturers/table.create') }}</a></li>
-      </ul>
-  </div>
+  <a href="{{ route('manufacturers.edit', $manufacturer) }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.update') }}</a>
 @stop
 
 {{-- Page content --}}
 @section('content')
+    <x-container columns="2">
+        <x-page-column class="col-md-9">
+            <x-tabs>
+                <x-slot:tabnav>
+                    @can('view', \App\Models\Asset::class)
+                        <x-tabs.nav-item
+                                name="assets"
+                                class="active"
+                                icon="fas fa-barcode fa-fw"
+                                label="{{ trans('general.assets') }}"
+                                count="{{ $manufacturer->assets()->AssetsForShow()->count() }}"
+                                tooltip="{{ trans('general.assets') }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\License::class)
+                        <x-tabs.nav-item
+                                name="licenses"
+                                icon="far fa-save"
+                                label="{{ trans('general.licenses') }}"
+                                count="{{ $manufacturer->licenses->count() }}"
+                                tooltip="{{ trans('general.licenses') }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\Accessory::class)
+                        <x-tabs.nav-item
+                                name="accessories"
+                                icon="far fa-keyboard fa-fw"
+                                label="{{ trans('general.accessories') }}"
+                                count="{{ $manufacturer->accessories->count() }}"
+                                tooltip="{{ trans('general.accessories') }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\Consumable::class)
+                        <x-tabs.nav-item
+                                name="consumables"
+                                icon="fas fa-tint fa-fw"
+                                label="{{ trans('general.consumables') }}"
+                                count="{{ $manufacturer->consumables->count() }}"
+                                tooltip="{{ trans('general.consumables') }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\Component::class)
+                        <x-tabs.nav-item
+                                name="components"
+                                icon="fas fa-hdd fa-fw"
+                                label="{{ trans('general.components') }}"
+                                count="{{ $manufacturer->components->count() }}"
+                                tooltip="{{ trans('general.components') }}"
+                        />
+                    @endcan
+
+                    @can('update', $manufacturer)
+                        <x-tabs.nav-item-upload />
+                    @endcan
+
+                </x-slot:tabnav>
+
+                <x-slot:tabpanes>
+                    <!-- start assets tab pane -->
+                    @can('view', \App\Models\Asset::class)
+                        <x-tabs.pane name="assets" class="in active">
+                            <x-slot:header>
+                                {{ trans('general.assets') }}
+                            </x-slot:header>
+
+                            <x-slot:bulkactions>
+                                <x-table.bulk-assets />
+                            </x-slot:bulkactions>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="assetButtons"
+                                        api_url="{{ route('api.assets.index', ['manufacturer_id' => $manufacturer->id, 'itemtype' => 'assets']) }}"
+                                        :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($manufacturer->name) }}-assets-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end assets tab pane -->
+
+                    <!-- start licenses tab pane -->
+                    @can('view', \App\Models\License::class)
+                        <x-tabs.pane name="licenses">
+                            <x-slot:header>
+                                {{ trans('general.licenses') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="licenseButtons"
+                                        api_url="{{ route('api.licenses.index', ['manufacturer_id' => $manufacturer->id]) }}"
+                                        :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($manufacturer->name) }}-licenses-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end licenses tab pane -->
+
+                    <!-- start accessories tab pane -->
+                    @can('view', \App\Models\Accessory::class)
+                        <x-tabs.pane name="accessories">
+                            <x-slot:header>
+                                {{ trans('general.accessories') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="accessoryButtons"
+                                        api_url="{{ route('api.accessories.index', ['manufacturer_id' => $manufacturer->id]) }}"
+                                        :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($manufacturer->name) }}-accessories-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end accessories tab pane -->
+
+                    <!-- start consumables tab pane -->
+                    @can('view', \App\Models\Consumable::class)
+                        <x-tabs.pane name="consumables">
+                            <x-slot:header>
+                                {{ trans('general.consumables') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="consumableButtons"
+                                        api_url="{{ route('api.consumables.index', ['manufacturer_id' => $manufacturer->id]) }}"
+                                        :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($manufacturer->name) }}-consumables-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end consumables tab pane -->
+
+                    <!-- start components tab pane -->
+                    @can('view', \App\Models\Component::class)
+                        <x-tabs.pane name="components">
+                            <x-slot:header>
+                                {{ trans('general.components') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="componentButtons"
+                                        api_url="{{ route('api.components.index', ['manufacturer_id' => $manufacturer->id]) }}"
+                                        :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($manufacturer->name) }}-components-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end components tab pane -->
+
+                </x-slot:tabpanes>
+            </x-tabs>
+        </x-page-column>
+        <x-page-column class="col-md-3">
+
+            <x-box>
+                <x-box.contact :contact="$manufacturer" img_path="{{ app('manufacturers_upload_url') }}">
+
+                </x-box.contact>
+            </x-box>
+        </x-page-column>
+    </x-container>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="nav-tabs-custom">
-
-      <ul class="nav nav-tabs">
-        <li class="active">
-
-          <a href="#assets" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-              <i class="fas fa-barcode fa-2x"></i>
-            </span>
-            <span class="hidden-xs hidden-sm">
-                {{ trans('general.assets') }}
-                {!! ($manufacturer->assets()->AssetsForShow()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($manufacturer->assets()->AssetsForShow()->count()).'</span>' : '' !!}
-            </span>
-          </a>
-
-        </li>
-        <li>
-          <a href="#licenses" data-toggle="tab">
-            <span class="hidden-lg hidden-md">
-               <x-icon type="licenses" class="fa-2x" />
-            </span>
-            <span class="hidden-xs hidden-sm">
-              {{ trans('general.licenses') }}
-              {!! ($manufacturer->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($manufacturer->licenses->count()).'</span>' : '' !!}
-            </span>
-
-          </a>
-        </li>
-        <li>
-          <a href="#accessories" data-toggle="tab">
-
-             <span class="hidden-lg hidden-md">
-              <x-icon type="accessories" class="fa-2x" />
-            </span>
-            <span class="hidden-xs hidden-sm">
-              {{ trans('general.accessories') }}
-              {!! ($manufacturer->accessories->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($manufacturer->accessories->count()).'</span>' : '' !!}
-            </span>
-          </a>
-        </li>
-        <li>
-          <a href="#consumables" data-toggle="tab">
-
-             <span class="hidden-lg hidden-md">
-               <x-icon type="consumables" class="fa-2x" />
-            </span>
-            <span class="hidden-xs hidden-sm">
-              {{ trans('general.consumables') }}
-              {!! ($manufacturer->consumables->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($manufacturer->consumables->count()).'</span>' : '' !!}
-            </span>
-          </a>
-        </li>
-
-        <li>
-          <a href="#components" data-toggle="tab">
-
-             <span class="hidden-lg hidden-md">
-               <x-icon type="components" class="fa-2x" />
-            </span>
-            <span class="hidden-xs hidden-sm">
-              {{ trans('general.components') }}
-              {!! ($manufacturer->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($manufacturer->components->count()).'</span>' : '' !!}
-            </span>
-
-          </a>
-        </li>
-      </ul>
-
-      <div class="tab-content">
-        <div class="tab-pane fade in active" id="assets">
-
-          @include('partials.asset-bulk-actions')
-
-          <table
-                  data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
-                  data-show-columns-search="true"
-                  data-cookie-id-table="assetsListingTable"
-                  data-id-table="assetsListingTable"
-                  data-toolbar="#assetsBulkEditToolbar"
-                  data-bulk-button-id="#bulkAssetEditButton"
-                  data-bulk-form-id="#assetsBulkForm"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="assetsListingTable"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.assets.index', ['manufacturer_id' => $manufacturer->id, 'itemtype' => 'assets']) }}"
-                  data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-assets-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
-
-        </div> <!-- /.tab-pane assets -->
-
-        <div class="tab-pane fade" id="licenses">
-
-          <table
-                  data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
-                  data-cookie-id-table="licensesTable"
-                  data-id-table="licensesTable"
-                  data-show-footer="true"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="licensesTable"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.licenses.index', ['manufacturer_id' => $manufacturer->id]) }}"
-                  data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-licenses-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
-
-
-        </div><!-- /.tab-pan licenses-->
-
-        <div class="tab-pane fade" id="accessories">
-
-          <table
-                  data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="accessoriesTable"
-                  data-id-table="accessoriesTable"
-                  data-show-footer="true"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="accessoriesTable"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.accessories.index', ['manufacturer_id' => $manufacturer->id]) }}"
-                  data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-accessories-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
-
-
-        </div> <!-- /.tab-pan accessories-->
-
-        <div class="tab-pane fade" id="consumables">
-
-          <table
-                  data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
-                  data-cookie-id-table="consumablesTable"
-                  data-id-table="consumablesTable"
-                  data-show-footer="true"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="consumablesTable"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.consumables.index', ['manufacturer_id' => $manufacturer->id]) }}"
-                  data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-consumables-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
-
-        </div> <!-- /.tab-pan consumables-->
-
-        <div class="tab-pane fade" id="components">
-
-          <table
-                  data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
-                  data-cookie-id-table="componentsTable"
-                  data-id-table="componentsTable"
-                  data-show-footer="true"
-                  data-side-pagination="server"
-                  data-sort-order="asc"
-                  id="componentsTable"
-                  class="table table-striped snipe-table"
-                  data-url="{{ route('api.components.index', ['manufacturer_id' => $manufacturer->id]) }}"
-                  data-export-options='{
-              "fileName": "export-manufacturers-{{ str_slug($manufacturer->name) }}-components-{{ date('Y-m-d') }}",
-              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-              }'>
-          </table>
-
-        </div> <!-- /.tab-pan consumables-->
-
-      </div> <!-- /.tab-content -->
-    </div>  <!-- /.nav-tabs-custom -->
-  </div><!-- /. col-md-12 -->
-</div> <!-- /.row -->
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index 13edd735dd5b..382035dea438 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -14,34 +14,30 @@
 
 {{-- Page content --}}
 @section('content')
-
     <x-container>
-        <x-box>
-
-    @include('partials.models-bulk-actions')
-            <table
-                    data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
-                    data-cookie-id-table="asssetModelsTable"
-                    data-id-table="asssetModelsTable"
-                    data-show-footer="true"
-                    data-side-pagination="server"
-                    data-footer-style="footerStyle"
-                    data-toolbar="#modelsBulkEditToolbar"
-                    data-bulk-button-id="#bulkModelsEditButton"
-                    data-bulk-form-id="#modelsBulkForm"
-                    data-sort-order="asc"
-                    id="asssetModelsTable"
-                    data-buttons="modelButtons"
-                    class="table table-striped snipe-table"
-                    data-url="{{ route('api.models.index', ['status' => e(request('status'))]) }}"
-                    data-export-options='{
-          "fileName": "export-models-{{ date('Y-m-d') }}",
-          "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-          }'>
-          </table>
+        <x-box name="models">
+
+
+            <x-slot:bulkactions>
+                <x-table.bulk-models />
+            </x-slot:bulkactions>
+
+            <x-table
+                    name="models"
+                    show_column_search="false"
+                    show_advanced_search="true"
+                    show_footer="true"
+                    buttons="modelButtons"
+                    fixed_right_number="2"
+                    fixed_number="1"
+                    toolbar_id="modelsToolbar"
+                    api_url="{{ route('api.models.index', ['status' => e(request('status'))]) }}"
+                    :presenter="\App\Presenters\AssetModelPresenter::dataTableLayout()"
+                    export_filename="export-models-{{ date('Y-m-d') }}"
+            />
+
         </x-box>
     </x-container>
-
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index c96c42ac32bb..2ab5cf6de8c6 100755
--- a/resources/views/statuslabels/index.blade.php
+++ b/resources/views/statuslabels/index.blade.php
@@ -8,69 +8,48 @@
 
 {{-- Page content --}}
 @section('content')
+    <x-container columns="2">
+
+        <x-page-column class="col-md-9">
+            <x-box>
+
+                <x-table
+                    name="statuslabel"
+                    buttons="statuslabelButtons"
+                    fixed_right_number="1"
+                    fixed_number="1"
+                    api_url="{{ route('api.statuslabels.index') }}"
+                    :presenter="\App\Presenters\StatusLabelPresenter::dataTableLayout()"
+                    export_filename="export-statuslabels-{{ date('Y-m-d') }}"
+                />
+
+            </x-box>
+        </x-page-column>
+        <x-page-column class="col-md-3">
+
+            <x-box>
+                <p>{!!  trans('admin/statuslabels/table.info') !!}</p>
+            </x-box>
+
+            <x-box box_style="success">
+                <p><i class="fas fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!!  trans('admin/statuslabels/message.help.deployable')  !!}</p>
+            </x-box>
+
+            <x-box box_style="warning">
+                <p><i class="fas fa-circle text-orange"></i> <strong>{{ trans('admin/statuslabels/table.pending') }}</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
+            </x-box>
+
+            <x-box box_style="danger">
+                <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.undeployable') }}</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
+            </x-box>
+
+            <x-box box_style="danger">
+                <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.archived') }}</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>
+            </x-box>
+
+        </x-page-column>
+    </x-container>
 
-<div class="row">
-  <div class="col-md-9">
-    <div class="box box-default">
-      <div class="box-body">
-            <table
-                    data-columns="{{ \App\Presenters\StatusLabelPresenter::dataTableLayout() }}"
-                    data-cookie-id-table="statuslabelsTable"
-                    data-id-table="statuslabelsTable"
-                    data-show-footer="false"
-                    data-side-pagination="server"
-                    data-sort-order="asc"
-                    data-sort-name="name"
-                    id="statuslabelsTable"
-                    data-buttons="statuslabelButtons"
-                    data-advanced-search="false"
-                    class="table table-striped snipe-table"
-                    data-url="{{ route('api.statuslabels.index') }}"
-                    data-export-options='{
-                "fileName": "export-statuslabels-{{ date('Y-m-d') }}",
-                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                }'>
-          </table>
-      </div>
-    </div>
-  </div>
-  <!-- side address column -->
-  <div class="col-md-3">
-    <h2>{{ trans('admin/statuslabels/table.about') }}</h2>
-
-      <div class="box box-default">
-          <div class="box-body">
-              <p>{!!  trans('admin/statuslabels/table.info') !!}</p>
-          </div>
-      </div>
-
-
-      <div class="box box-success">
-          <div class="box-body">
-          <p><i class="fas fa-circle text-green"></i> <strong>{{ trans('admin/statuslabels/table.deployable') }}</strong>: {!!  trans('admin/statuslabels/message.help.deployable')  !!}</p>
-          </div>
-      </div>
-
-      <div class="box box-warning">
-          <div class="box-body">
-              <p><i class="fas fa-circle text-orange"></i> <strong>{{ trans('admin/statuslabels/table.pending') }}</strong>: {{ trans('admin/statuslabels/message.help.pending') }}</p>
-          </div>
-      </div>
-      <div class="box box-danger">
-          <div class="box-body">
-            <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.undeployable') }}</strong>: {{ trans('admin/statuslabels/message.help.undeployable') }}</p>
-          </div>
-      </div>
-
-      <div class="box box-danger">
-          <div class="box-body">
-              <p><i class="fas fa-times text-red"></i> <strong>{{ trans('admin/statuslabels/table.archived') }}</strong>: {{ trans('admin/statuslabels/message.help.archived') }}</p>
-          </div>
-      </div>
-
-  </div>
-
-</div>
 @stop
 
 @section('moar_scripts')
diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php
index 1e5d2b7f5b9d..cb0f60feea8d 100755
--- a/resources/views/suppliers/index.blade.php
+++ b/resources/views/suppliers/index.blade.php
@@ -11,39 +11,29 @@
     <x-container>
         <x-box>
 
-              <x-tables.bulk-actions
-                      id_divname='suppliersBulkEditToolbar'
-                      action_route="{{route('suppliers.bulk.delete')}}"
-                      id_formname="suppliersBulkForm"
-                      id_button="bulkSupplierEditButton"
-                      model_name="supplier"
-              >
-              @can('delete', App\Models\Supplier::class)
-                  <option>Delete</option>
-              @endcan
-              </x-tables.bulk-actions>
+            <x-slot:bulkactions>
+                <x-table.bulk-actions
+                        name='supplier'
+                        action_route="{{route('suppliers.bulk.delete')}}"
+                        model_name="supplier"
+                >
+                    @can('delete', App\Models\Supplier::class)
+                        <option>{{ trans('general.delete') }}</option>
+                    @endcan
+                </x-table.bulk-actions>
+            </x-slot:bulkactions>
+
+
+            <x-table
+                name="supplier"
+                buttons="supplierButtons"
+                fixed_right_number="1"
+                fixed_number="1"
+                api_url="{{ route('api.suppliers.index') }}"
+                :presenter="\App\Presenters\SupplierPresenter::dataTableLayout()"
+                export_filename="export-suppliers-{{ date('Y-m-d') }}"
+            />
 
-            <table
-            data-columns="{{ \App\Presenters\SupplierPresenter::dataTableLayout() }}"
-            data-cookie-id-table="suppliersTable"
-            data-id-table="suppliersTable"
-            data-side-pagination="server"
-            data-sort-order="asc"
-            id="suppliersTable"
-            {{-- begin stuff for bulk dropdown --}}
-            data-toolbar="#suppliersBulkEditToolbar"
-            data-bulk-button-id="#bulkSupplierEditButton"
-            data-bulk-form-id="#suppliersBulkForm"
-            {{-- end stuff for bulk dropdown --}}
-            data-advanced-search="false"
-            data-buttons="supplierButtons"
-            class="table table-striped snipe-table"
-            data-url="{{ route('api.suppliers.index') }}"
-            data-export-options='{
-            "fileName": "export-suppliers-{{ date('Y-m-d') }}",
-            "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-            }'>
-      </table>
         </x-box>
     </x-container>
 @stop
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index ae52f6eee295..51b69c4ccb0b 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -10,331 +10,235 @@
 @stop
 
 @section('header_right')
-    <a href="{{ route('suppliers.edit', $supplier->id) }}" class="btn btn-default pull-right">
-        {{ trans('admin/suppliers/table.update') }}</a>
-
-    <a href="{{ route('suppliers.index') }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.back') }}</a>
-
+    <a href="{{ route('suppliers.edit', $supplier->id) }}" class="btn btn-theme pull-right">
+        {{ trans('general.update') }}</a>
 @stop
 
 
 {{-- Page content --}}
 @section('content')
-
-  <div class="row">
-    <div class="col-md-9">
-
-      <div class="nav-tabs-custom">
-        <ul class="nav nav-tabs hidden-print">
-          
-          <li class="active">
-            <a href="#assets" data-toggle="tab">
-
-                <span class="hidden-lg hidden-md">
-                    <x-icon type="assets" class="fa-2x" />
-                </span>
-                <span class="hidden-xs hidden-sm">
-                    {{ trans('general.assets') }}
-                    {!! ($supplier->assets()->AssetsForShow()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->assets()->AssetsForShow()->count()).'</span>' : '' !!}
-               </span>
-
-            </a>
-          </li>
-
-          <li>
-            <a href="#accessories" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <x-icon type="accessories" class="fa-2x" />
-                    </span>
-              <span class="hidden-xs hidden-sm">
-                          {{ trans('general.accessories') }}
-                          {!! ($supplier->accessories->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->accessories->count()).'</span>' : '' !!}
-                    </span>
-            </a>
-          </li>
-
-          <li>
-            <a href="#licenses" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <x-icon type="licenses" class="fa-2x" />
-                    </span>
-              <span class="hidden-xs hidden-sm">
-                          {{ trans('general.licenses') }}
-                          {!! ($supplier->licenses->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->licenses->count()).'</span>' : '' !!}
-                    </span>
-            </a>
-          </li>
-
-            <li>
-                <a href="#components" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <x-icon type="components" class="fa-2x" />
-                    </span>
-                    <span class="hidden-xs hidden-sm">
-                          {{ trans('general.components') }}
-                        {!! ($supplier->components->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->components->count()).'</span>' : '' !!}
-                    </span>
-                </a>
-            </li>
-
-            <li>
-                <a href="#consumables" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <x-icon type="consumables" class="fa-2x" />
-                    </span>
-                    <span class="hidden-xs hidden-sm">
-                          {{ trans('general.consumables') }}
-                        {!! ($supplier->consumables->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->consumables->count()).'</span>' : '' !!}
-                    </span>
-                </a>
-            </li>
-
-          <li>
-            <a href="#maintenances" data-toggle="tab">
-                    <span class="hidden-lg hidden-md">
-                        <x-icon type="maintenances" class="fa-2x" />
-                    </span>
-              <span class="hidden-xs hidden-sm">
-                        {{ trans('admin/maintenances/general.maintenances') }}
-                        {!! ($supplier->maintenances->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->maintenances->count()).'</span>' : '' !!}
-                    </span>
-            </a>
-          </li>
-
-            <li>
-                <a href="#files" data-toggle="tab">
-
-                        <span class="hidden-lg hidden-md">
-                          <i class="fas fa-barcode fa-2x"></i>
-                        </span>
-                    <span class="hidden-xs hidden-sm">
+    <x-container columns="2">
+        <x-page-column class="col-md-9">
+            <x-tabs>
+                <x-slot:tabnav>
+                    @can('view', \App\Models\Asset::class)
+                        <x-tabs.nav-item
+                            name="assets"
+                            class="active"
+                            icon="fas fa-barcode fa-fw"
+                            label="{{ trans('general.assets') }}"
+                            count="{{ $supplier->assets()->AssetsForShow()->count() }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\Accessory::class)
+                        <x-tabs.nav-item
+                                name="accessories"
+                                icon="far fa-keyboard fa-fw"
+                                label="{{ trans('general.accessories') }}"
+                                count="{{ $supplier->accessories()->count() }}"
+                        />
+                    @endcan
+
+
+                    @can('view', \App\Models\Consumable::class)
+                        <x-tabs.nav-item
+                                name="consumables"
+                                icon="fas fa-tint fa-fw"
+                                label="{{ trans('general.consumables') }}"
+                                count="{{ $supplier->consumables()->count() }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\Component::class)
+                        <x-tabs.nav-item
+                                name="components"
+                                icon="fas fa-hdd fa-fw"
+                                label="{{ trans('general.components') }}"
+                                count="{{ $supplier->components->count() }}"
+                        />
+                    @endcan
+
+                    @can('view', \App\Models\AssetMaintenance::class)
+                        <x-tabs.nav-item
+                                name="maintenances"
+                                icon="fa-solid fa-screwdriver-wrench"
+                                label="{{ trans('general.maintenances') }}"
+                                count="{{ $supplier->maintenances->count() }}"
+                        />
+                    @endcan
+
+                <x-tabs.nav-item
+                    name="files"
+                    icon="fa-solid fa-file-contract fa-fw"
+                    label="{{ trans('general.files') }}"
+                    count="{{ $supplier->uploads()->count() }}"
+                />
+
+                @can('update', $supplier)
+                    <x-tabs.nav-item-upload />
+                @endcan
+
+                </x-slot:tabnav>
+
+
+
+                <x-slot:tabpanes>
+
+                    <!-- start assets tab pane -->
+                    @can('view', \App\Models\Asset::class)
+                        <x-tabs.pane name="assets" class="in active">
+                            <x-slot:header>
+                                {{ trans('general.assets') }}
+                            </x-slot:header>
+
+                            <x-slot:bulkactions>
+                                <x-table.bulk-users />
+                            </x-slot:bulkactions>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        show_advanced_search="true"
+                                        buttons="assetButtons"
+                                        api_url="{{ route('api.assets.index', ['supplier_id' => $supplier->id, 'itemtype' => 'assets']) }}"
+                                        :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-assets-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end assets tab pane -->
+
+
+                    <!-- start accessories tab pane -->
+                    @can('view', \App\Models\Accessory::class)
+                        <x-tabs.pane name="accessories">
+                            <x-slot:header>
+                                {{ trans('general.accessories') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_column_search="true"
+                                        buttons="accessoryButtons"
+                                        api_url="{{ route('api.accessories.index', ['supplier_id' => $supplier->id]) }}"
+                                        :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-accessories-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end accessories tab pane -->
+
+                    <!-- start licenses tab pane -->
+                    @can('view', \App\Models\License::class)
+                        <x-tabs.pane name="licenses">
+                            <x-slot:header>
+                                {{ trans('general.licenses') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_advanced_search="true"
+                                        buttons="licenseButtons"
+                                        api_url="{{ route('api.licenses.index', ['supplier_id' => $supplier->id]) }}"
+                                        :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-licenses-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end licenses tab pane -->
+
+                    <!-- start components tab pane -->
+                    @can('view', \App\Models\Component::class)
+                        <x-tabs.pane name="components">
+                            <x-slot:header>
+                                {{ trans('general.components') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_advanced_search="true"
+                                        buttons="componentButtons"
+                                        api_url="{{ route('api.components.index', ['supplier_id' => $supplier->id]) }}"
+                                        :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-components-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end components tab pane -->
+
+                    <!-- start consumables tab pane -->
+                    @can('view', \App\Models\Consumable::class)
+                        <x-tabs.pane name="consumables">
+                            <x-slot:header>
+                                {{ trans('general.consumables') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        show_advanced_search="true"
+                                        buttons="consumableButtons"
+                                        api_url="{{ route('api.consumables.index', ['supplier_id' => $supplier->id]) }}"
+                                        :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-consumables-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end consumables tab pane -->
+
+
+                    <!-- start consumables tab pane -->
+                    @can('view', \App\Models\Asset::class)
+                        <x-tabs.pane name="maintenances">
+                            <x-slot:header>
+                                {{ trans('admin/maintenances/general.maintenances') }}
+                            </x-slot:header>
+
+                            <x-slot:content>
+                                <x-table
+                                        buttons="maintenanceButtons"
+                                        api_url="{{ route('api.maintenances.index', ['supplier_id' => $supplier->id]) }}"
+                                        :presenter="\App\Presenters\MaintenancesPresenter::dataTableLayout()"
+                                        export_filename="export-{{ str_slug($supplier->name) }}-maintenances-{{ date('Y-m-d') }}"
+                                />
+                            </x-slot:content>
+                        </x-tabs.pane>
+                    @endcan
+                    <!-- end consumables tab pane -->
+
+                    <!-- start files tab pane -->
+                    <x-tabs.pane name="files">
+                        <x-slot:header>
                             {{ trans('general.files') }}
-                        {!! ($supplier->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->uploads->count()).'</span>' : '' !!}
-                          </span>
-                </a>
-            </li>
-
-            <li class="pull-right">
-                <a href="#" data-toggle="modal" data-target="#uploadFileModal">
-                    <x-icon type="paperclip" />
-                    {{ trans('button.upload') }}
-                </a>
-            </li>
-        </ul>
-
-
-        <div class="tab-content">
-
-
-          <div class="tab-pane active" id="assets">
-            <h2 class="box-title">{{ trans('general.assets') }}</h2>
-
-
-              @include('partials.asset-bulk-actions')
-              <table
-                      data-cookie-id-table="suppliersAssetsTable"
-                      data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
-                      data-show-columns-search="true"
-                      data-id-table="suppliersAssetsTable"
-                      data-show-footer="true"
-                      data-side-pagination="server"
-                      data-sort-order="asc"
-                      data-toolbar="#assetsBulkEditToolbar"
-                      data-bulk-button-id="#bulkAssetEditButton"
-                      data-bulk-form-id="#assetsBulkForm"
-                      id="suppliersAssetsTable"
-                      class="table table-striped snipe-table"
-                      data-url="{{route('api.assets.index', ['supplier_id' => $supplier->id]) }}"
-                      data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-assets-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-              </table>
-          </div><!-- /.tab-pane -->
-
-
-
-          <div class="tab-pane" id="accessories">
-            <h2 class="box-title">{{ trans('general.accessories') }}</h2>
-              <table
-                      data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
-                      data-cookie-id-table="accessoriesListingTable"
-                      data-id-table="accessoriesListingTable"
-                      data-side-pagination="server"
-                      data-sort-order="asc"
-                      id="accessoriesListingTable"
-                      class="table table-striped snipe-table"
-                      data-url="{{route('api.accessories.index', ['supplier_id' => $supplier->id]) }}"
-                      data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-accessories-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-              </table>
-          </div><!-- /.tab-pane -->
-
-
-          <div class="tab-pane" id="licenses">
-            <h2 class="box-title">{{ trans('general.licenses') }}</h2>
-
-              <table
-                      data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
-                      data-cookie-id-table="licensesListingTable"
-                      data-id-table="licensesListingTable"
-                      data-side-pagination="server"
-                      data-sort-order="asc"
-                      id="licensesListingTable"
-                      class="table table-striped snipe-table"
-                      data-url="{{route('api.licenses.index', ['supplier_id' => $supplier->id]) }}"
-                      data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-licenses-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-              </table>
-
-          </div><!-- /.tab-pane -->
-
-            <div class="tab-pane" id="components">
-                <h2 class="box-title">{{ trans('general.components') }}</h2>
-
-                    <table
-                            data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
-                            data-cookie-id-table="componentsListingTable"
-                            data-id-table="componentsListingTable"
-                            data-side-pagination="server"
-                            data-sort-order="asc"
-                            id="accessoriesListingTable"
-                            class="table table-striped snipe-table"
-                            data-url="{{route('api.components.index', ['supplier_id' => $supplier->id]) }}"
-                            data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-components-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-                    </table>
-            </div><!-- /.tab-pane -->
-
-            <div class="tab-pane" id="consumables">
-            <h2 class="box-title">{{ trans('general.consumables') }}</h2>
-
-                <table
-                        data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
-                        data-cookie-id-table="consumablesListingTable"
-                        data-id-table="consumablesListingTable"
-                        data-side-pagination="server"
-                        data-sort-order="asc"
-                        id="accessoriesListingTable"
-                        class="table table-striped snipe-table"
-                        data-url="{{route('api.consumables.index', ['supplier_id' => $supplier->id]) }}"
-                        data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-consumables-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-                </table>
-        </div><!-- /.tab-pane -->
-
-
-          <div class="tab-pane" id="maintenances">
-            <h2 class="box-title">{{ trans('admin/maintenances/general.maintenances') }}</h2>
-
-              <table
-                      data-columns="{{ \App\Presenters\MaintenancesPresenter::dataTableLayout() }}"
-                      data-cookie-id-table="maintenancesTable"
-                      data-id-table="maintenancesTable"
-                      data-side-pagination="server"
-                      data-sort-order="asc"
-                      id="maintenancesTable"
-                      data-buttons="maintenanceButtons"
-                      class="table table-striped snipe-table"
-                      data-url="{{ route('api.maintenances.index', ['supplier_id' => $supplier->id])}}"
-                      data-export-options='{
-                              "fileName": "export-suppliers-{{ str_slug($supplier->name) }}-maintenances-{{ date('Y-m-d') }}",
-                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
-                              }'>
-
-              </table>
-          </div><!-- /.tab-pane -->
-
-            <div class="tab-pane fade" id="files">
-                <div class="row">
-                    <div class="col-md-12">
-                        <x-filestable object_type="suppliers" :object="$supplier" />
-                    </div> <!-- /.col-md-12 -->
-                </div> <!-- /.row -->
-            </div>
-
-        </div><!--/.col-md-9-->
-      </div><!--/.col-md-9-->
-    </div><!--/.col-md-9-->
-
-      <!-- side address column -->
-      <div class="col-md-3">
-
-
-      @if (($supplier->address!='') && ($supplier->state!='') && ($supplier->country!='') && (config('services.google.maps_api_key')))
-              <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-                  <img src="https://maps.googleapis.com/maps/api/staticmap?markers={{ urlencode($supplier->address.','.$supplier->city.' '.$supplier->state.' '.$supplier->country.' '.$supplier->zip) }}&size=500x300&maptype=roadmap&key={{ config('services.google.maps_api_key') }}" class="img-responsive img-thumbnail" alt="Map">
-              </div>
-          @endif
-
-
-          <ul class="list-unstyled" style="line-height: 25px; padding-bottom: 20px; padding-top: 20px;">
-              @if ($supplier->contact!='')
-                  <li><x-icon type="user" /> {{ $supplier->contact }}</li>
-              @endif
-              @if ($supplier->phone!='')
-                  <li><i class="fas fa-phone"></i>
-                      <a href="tel:{{ $supplier->phone }}">{{ $supplier->phone }}</a>
-                  </li>
-              @endif
-              @if ($supplier->fax!='')
-                  <li><i class="fas fa-print"></i> {{ $supplier->fax }}</li>
-              @endif
-
-              @if ($supplier->email!='')
-                  <li>
-                      <i class="far fa-envelope"></i>
-                      <a href="mailto:{{ $supplier->email }}">
-                          {{ $supplier->email }}
-                      </a>
-                  </li>
-              @endif
-
-              @if ($supplier->url!='')
-                  <li>
-                      <i class="fas fa-globe-americas"></i>
-                      <a href="{{ $supplier->url }}" target="_new">{{ $supplier->url }}</a>
-                  </li>
-              @endif
-
-              @if ($supplier->address!='')
-                  <li><br>
-                      {{ $supplier->address }}
-
-                      @if ($supplier->address2)
-                          <br>
-                          {{ $supplier->address2 }}
-                      @endif
-                      @if (($supplier->city) || ($supplier->state))
-                          <br>
-                          {{ $supplier->city }} {{ strtoupper($supplier->state) }} {{ $supplier->zip }} {{ strtoupper($supplier->country) }}
-                      @endif
-                  </li>
-              @endif
-
-              @if ($supplier->notes!='')
-                  <li><i class="fa fa-comment"></i> {!! nl2br(Helper::parseEscapedMarkedownInline($supplier->notes)) !!}</li>
-              @endif
-
-          </ul>
-          @if ($supplier->image!='')
-              <div class="col-md-12 text-center" style="padding-bottom: 20px;">
-                  <img src="{{ Storage::disk('public')->url(app('suppliers_upload_url').e($supplier->image)) }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}">
-              </div>
-          @endif
-
-      </div> <!--/col-md-3-->
-
-  </div>
-  </div>
+                        </x-slot:header>
+                        <x-slot:content>
+                            <x-filestable object_type="suppliers" :object="$supplier" />
+                        </x-slot:content>
+                    </x-tabs.pane>
+                    <!-- end files tab pane -->
+
+                </x-slot:tabpanes>
+
+            </x-tabs>
+        </x-page-column>
+        <x-page-column class="col-md-3">
+
+            <x-box>
+                <x-box.contact :contact="$supplier" img_path="{{ app('suppliers_upload_url') }}">
+                </x-box.contact>
+            </x-box>
+        </x-page-column>
+
+    </x-container>
+
 
   @can('update', \App\Models\Supplier::class)
       @include ('modals.upload-file', ['item_type' => 'supplier', 'item_id' => $supplier->id])
diff --git a/tests/Feature/Console/OptimizeTest.php b/tests/Feature/Console/OptimizeTest.php
index 8dd6f270f948..b892e57c2434 100644
--- a/tests/Feature/Console/OptimizeTest.php
+++ b/tests/Feature/Console/OptimizeTest.php
@@ -11,6 +11,7 @@ public function testOptimizeSucceeds()
         $this->beforeApplicationDestroyed(function () {
             $this->artisan('config:clear');
             $this->artisan('route:clear');
+            $this->artisan('view:clear');
         });
 
         $this->artisan('optimize')->assertSuccessful();