diff --git a/resources/views/layout/partials/sidebar-layout/_page-title.blade.php b/resources/views/layout/partials/sidebar-layout/_page-title.blade.php
index 50b6645..e85b7e9 100644
--- a/resources/views/layout/partials/sidebar-layout/_page-title.blade.php
+++ b/resources/views/layout/partials/sidebar-layout/_page-title.blade.php
@@ -4,42 +4,44 @@
         $route = explode('.',Route::currentRouteName());
     @endphp
 
-	<!--begin::Title-->
-	<h1 class="page-heading d-flex text-dark fw-bold fs-3 flex-column justify-content-center my-0 text-capitalize">
+        <!--begin::Title-->
+    <h1 class="page-heading d-flex text-dark fw-bold fs-3 flex-column justify-content-center my-0 text-capitalize">
         {{ ucfirst(str_replace('-',' ',$route[0])) }}
         @if(count($route) > 1)
-            @if($route[1] !== 'index' && $route[1] !== 'users')
+            @if($route[1] !== 'index' && $route[1] !== 'users' && $route[1] !== 'show')
                 {{ $route[1] }}
             @endif
         @endif
     </h1>
-	<!--end::Title-->
-	<!--begin::Breadcrumb-->
-	<ul class="breadcrumb breadcrumb-separatorless fw-semibold fs-7 my-0 pt-1">
-		<!--begin::Item-->
-		<li class="breadcrumb-item text-muted">
-			<a href="{{ route('dashboard') }}" class="text-muted text-hover-primary">Dashboard</a>
-		</li>
-		<!--end::Item-->
-		<!--begin::Item-->
-		<li class="breadcrumb-item">
-			<span class="bullet bg-gray-400 w-5px h-2px"></span>
-		</li>
-		<!--end::Item-->
+    <!--end::Title-->
+    <!--begin::Breadcrumb-->
+    <ul class="breadcrumb breadcrumb-separatorless fw-semibold fs-7 my-0 pt-1">
+        <!--begin::Item-->
+        <li class="breadcrumb-item text-muted">
+            <a href="{{ route('dashboard') }}" class="text-muted text-hover-primary">Dashboard</a>
+        </li>
+        <!--end::Item-->
+        <!--begin::Item-->
+        <li class="breadcrumb-item">
+            <span class="bullet bg-gray-400 w-5px h-2px"></span>
+        </li>
+        <!--end::Item-->
 
         @if(count($route) > 1)
             @if($route[1] !== 'index' && $route[1] !=='users')
                 <!--begin::Item-->
                 <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li>
                 <!--end::Item-->
-                <!--begin::Item-->
-                <li class="breadcrumb-item">
-                    <span class="bullet bg-gray-400 w-5px h-2px"></span>
-                </li>
-                <!--end::Item-->
-                <!--begin::Item-->
-                <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[1]))}}</li>
-                <!--end::Item-->
+                @if(isset($route[1]) && $route[1]!=='show')
+                    <!--begin::Item-->
+                    <li class="breadcrumb-item">
+                        <span class="bullet bg-gray-400 w-5px h-2px"></span>
+                    </li>
+                    <!--end::Item-->
+                    <!--begin::Item-->
+                    <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[1]))}}</li>
+                    <!--end::Item-->
+                @endif
             @else
                 <!--begin::Item-->
                 <li class="breadcrumb-item text-muted text-capitalize">{{ ucfirst(str_replace('-',' ',$route[0])) }}</li>
@@ -51,7 +53,7 @@
             <!--end::Item-->
         @endif
 
-	</ul>
-	<!--end::Breadcrumb-->
+    </ul>
+    <!--end::Breadcrumb-->
 </div>
 <!--end::Page title-->
diff --git a/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php b/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
index e95b94b..15d2d89 100644
--- a/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
+++ b/resources/views/layout/partials/sidebar-layout/_toolbar.blade.php
@@ -1,50 +1,74 @@
+@php
+    $route = explode('.',Route::currentRouteName());
+@endphp
+
+@if(file_exists(dirname(__FILE__, 4) . '/Modules/'.ucwords($route[0]).'/Resources/views/partials/_toolbar.blade.php'))
+    @include(strtolower($route[0]).'::partials._toolbar')
+@else
 <!--begin::Toolbar-->
 <div id="kt_app_toolbar" class="app-toolbar py-3 py-lg-6">
     <!--begin::Toolbar container-->
     <div id="kt_app_toolbar_container" class="app-container container-fluid d-flex flex-stack">
         @include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/_page-title')
-        @php
-            $route = explode('.',Route::currentRouteName());
-        @endphp
 
-        @if(isset($route[1]) && $route[1] == 'index')
-            @if($route[0]=='document')<!--begin::Actions-->
-                <div class="d-flex align-items-center gap-2 gap-lg-3">
-                    <!--begin::Primary button-->
-                    <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add {{ str_replace('-',' ',$route[0]) }}</a>
-                    <!--end::Primary button-->
-                </div>
-                <!--end::Actions-->
-            @else
-            <!--begin::Actions-->
+        @if(isset($route[0]) && $route[0]!=='cardboard-detail')
+            @if(isset($route[1]) && $route[1] == 'index')
+                @if($route[0]=='document')
+                    <!--begin::Actions-->
+                    <div class="d-flex align-items-center gap-2 gap-lg-3">
+                        <!--begin::Primary button-->
+                        <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add {{ str_replace('-',' ',$route[0]) }}</a>
+                        <!--end::Primary button-->
+                    </div>
+                    <!--end::Actions-->
+                @elseif($route[0]!=='settings')
+                    <!--begin::Actions-->
+                    <div class="d-flex align-items-center gap-2 gap-lg-3">
+                        <!--begin::Primary button-->
+                        <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}">Add {{ str_replace('-',' ',$route[0]) }}</a>
+                        <!--end::Primary button-->
+                    </div>
+                    <!--end::Actions-->
+                @endif
+            @elseif(isset($route[2]) && $route[2] == 'index')
+                @if($route[1]!=='users' || $route[0] !=='log')
+                    <!--begin::Actions-->
+                    <div class="d-flex align-items-center gap-2 gap-lg-3">
+                        <!--begin::Primary button-->
+                        <a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
+                        <!--end::Primary button-->
+                    </div>
+                    <!--end::Actions-->
+                @else
+
+                    <!--begin::Actions-->
+                    <div class="d-flex align-items-center gap-2 gap-lg-3">
+                        <!--begin::Primary button-->
+                        <a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
+                        <!--end::Primary button-->
+                    </div>
+                    <!--end::Actions-->
+                @endif
+            @endif
+        @elseif($route[0]=='cardboard-detail' && isset($route[1]) && $route[1] == 'show')
+            @php
+                $link = explode('/',url()->current());
+				$id = end($link);
+            @endphp
+                <!--begin::Actions-->
             <div class="d-flex align-items-center gap-2 gap-lg-3">
                 <!--begin::Primary button-->
-                <a href="{{ route($route[0].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}">Add {{ str_replace('-',' ',$route[0]) }}</a>
+                <a href="{{ route($route[0].'.index') }}?id={{ $id }}" class="btn btn-sm fw-bold btn-primary text-capitalize">Add Odner</a>
+                <!--end::Primary button-->
+
+                <!--begin::Primary button-->
+                <a href="{{ route('cardboard.index') }}" class="btn btn-sm fw-bold btn-warning text-capitalize">Back</a>
                 <!--end::Primary button-->
             </div>
             <!--end::Actions-->
-            @endif
-        @elseif(isset($route[2]) && $route[2] == 'index')
-            @if($route[1]!=='users')
-                <!--begin::Actions-->
-                <div class="d-flex align-items-center gap-2 gap-lg-3">
-                    <!--begin::Primary button-->
-                    <a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
-                    <!--end::Primary button-->
-                </div>
-                <!--end::Actions-->
-            @else
-
-                <!--begin::Actions-->
-                <div class="d-flex align-items-center gap-2 gap-lg-3">
-                    <!--begin::Primary button-->
-                    <a href="{{ route($route[0].'.'.$route[1].'.create') }}" class="btn btn-sm fw-bold btn-primary text-capitalize" data-bs-toggle="modal" data-bs-target="#kt_modal_{{ $route[0] }}_{{ $route[1] }}">Add {{ str_replace('-',' ',$route[1]) }}</a>
-                    <!--end::Primary button-->
-                </div>
-                <!--end::Actions-->
-                @endif
         @endif
     </div>
     <!--end::Toolbar container-->
 </div>
 <!--end::Toolbar-->
+@endif