diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
index 9eaad997..6a3320f8 100644
--- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
@@ -614,7 +614,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        @include("layouts.partials.topbar")
+        ("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
index d67a712e..9feaafff 100644
--- a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
+++ b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
@@ -608,7 +608,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        @include("layouts.partials.topbar")
+        ("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index eb2dd97e..7c52869b 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -166,6 +166,19 @@
         color: #ffffff;
     }
 
+
+    .wms-sidebar-primary-link {
+        margin-bottom: 0.35rem;
+        min-height: 3.25rem;
+        font-size: 0.8rem;
+        font-weight: 800;
+        letter-spacing: 0.16em;
+        text-transform: uppercase;
+    }
+
+    .wms-sidebar-primary-link span {
+        letter-spacing: 0.16em;
+    }
     .wms-sidebar-link.is-active {
         position: relative;
         isolation: isolate;
@@ -292,29 +305,26 @@
         </div>
 
         <nav class="wms-sidebar-nav" aria-label="{{ __('Main navigation') }}">
-            <div class="wms-sidebar-group" data-wms-menu-group="platform">
-                <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
-                    <span class="wms-sidebar-heading-content">
+            @php
+                $platformRoute = auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard')
+                    ? 'platform.dashboard'
+                    : (Route::has('dashboard') ? 'dashboard' : null);
+            @endphp
+
+            @if($platformRoute)
+                <div class="wms-sidebar-group" data-wms-menu-group="platform">
+                    <a
+                        href="{{ route($platformRoute) }}"
+                        wire:navigate
+                        class="wms-sidebar-link wms-sidebar-primary-link @if(request()->routeIs('platform.dashboard') || request()->routeIs('dashboard')) is-active @endif"
+                        title="{{ __('Platform') }}"
+                        data-wms-sidebar-label
+                    >
                         <i class="fa-solid fa-screwdriver-wrench wms-sidebar-icon" aria-hidden="true"></i>
                         <span>{{ __('Platform') }}</span>
-                    </span>
-                </button>
-
-                <div class="wms-sidebar-group-items" data-wms-menu-items>
-                    @if(auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard'))
-                        <a href="{{ route('platform.dashboard') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('platform.dashboard')) is-active @endif" title="{{ __('Platform') }}">
-                            <i class="fa-solid fa-screwdriver-wrench wms-sidebar-icon" aria-hidden="true"></i>
-                            <span data-wms-sidebar-label>{{ __('Platform') }}</span>
-                        </a>
-                    @elseif(Route::has('dashboard'))
-                        <a href="{{ route('dashboard') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('dashboard')) is-active @endif" title="{{ __('Dashboard') }}">
-                            <i class="fa-solid fa-gauge-high wms-sidebar-icon" aria-hidden="true"></i>
-                            <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                        </a>
-                    @endif
+                    </a>
                 </div>
-            </div>
-
+            @endif
             <div class="wms-sidebar-group" data-wms-menu-group="operations">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">
diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php
index 335b635f..f77403d2 100644
--- a/resources/views/layouts/app/sidebar.blade.php
+++ b/resources/views/layouts/app/sidebar.blade.php
@@ -166,6 +166,19 @@
         color: #ffffff;
     }
 
+
+    .wms-sidebar-primary-link {
+        margin-bottom: 0.35rem;
+        min-height: 3.25rem;
+        font-size: 0.8rem;
+        font-weight: 800;
+        letter-spacing: 0.16em;
+        text-transform: uppercase;
+    }
+
+    .wms-sidebar-primary-link span {
+        letter-spacing: 0.16em;
+    }
     .wms-sidebar-link.is-active {
         position: relative;
         isolation: isolate;
@@ -292,29 +305,26 @@
         </div>
 
         <nav class="wms-sidebar-nav" aria-label="{{ __('Main navigation') }}">
-            <div class="wms-sidebar-group" data-wms-menu-group="platform">
-                <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
-                    <span class="wms-sidebar-heading-content">
+            @php
+                $platformRoute = auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard')
+                    ? 'platform.dashboard'
+                    : (Route::has('dashboard') ? 'dashboard' : null);
+            @endphp
+
+            @if($platformRoute)
+                <div class="wms-sidebar-group" data-wms-menu-group="platform">
+                    <a
+                        href="{{ route($platformRoute) }}"
+                        wire:navigate
+                        class="wms-sidebar-link wms-sidebar-primary-link @if(request()->routeIs('platform.dashboard') || request()->routeIs('dashboard')) is-active @endif"
+                        title="{{ __('Platform') }}"
+                        data-wms-sidebar-label
+                    >
                         <i class="fa-solid fa-screwdriver-wrench wms-sidebar-icon" aria-hidden="true"></i>
                         <span>{{ __('Platform') }}</span>
-                    </span>
-                </button>
-
-                <div class="wms-sidebar-group-items" data-wms-menu-items>
-                    @if(auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard'))
-                        <a href="{{ route('platform.dashboard') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('platform.dashboard')) is-active @endif" title="{{ __('Platform') }}">
-                            <i class="fa-solid fa-screwdriver-wrench wms-sidebar-icon" aria-hidden="true"></i>
-                            <span data-wms-sidebar-label>{{ __('Platform') }}</span>
-                        </a>
-                    @elseif(Route::has('dashboard'))
-                        <a href="{{ route('dashboard') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('dashboard')) is-active @endif" title="{{ __('Dashboard') }}">
-                            <i class="fa-solid fa-gauge-high wms-sidebar-icon" aria-hidden="true"></i>
-                            <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                        </a>
-                    @endif
+                    </a>
                 </div>
-            </div>
-
+            @endif
             <div class="wms-sidebar-group" data-wms-menu-group="operations">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">