diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
index 6b706472..d74cd0d6 100644
--- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
@@ -397,72 +397,19 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
-                        <span class="wms-sidebar-heading-content">
-                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                            <span>{{ __('Support') }}</span>
-                        </span>
-                    </button>
+                @if(Route::has('helpdesk.index'))
+                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
+                    </a>
+                @endif
 
-                    <div class="wms-sidebar-group-items" data-wms-menu-items>
-                        @if(Route::has('helpdesk.index'))
-                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.index'))
-                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
-                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.create'))
-                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
-                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskKanbanRoute)
-                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
-                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskGitRoute)
-                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
-                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskWorkflowRoute)
-                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
-                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
-                            </a>
-                        @endif
-
-                        @if($documentationRoute)
-                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskSettingsRoute)
-                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
-                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
-                            </a>
-                        @endif
-                    </div>
-                </div>
+                @if($documentationRoute)
+                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                    </a>
+                @endif
             @endif
 
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
@@ -605,37 +552,17 @@
             @endif
         </nav>
 
-        <button
-            type="button"
-            class="wms-sidebar-resizer"
-            data-wms-sidebar-resizer
-            aria-label="{{ __('Resize sidebar') }}"
-            title="{{ __('Drag to resize sidebar') }}"
-        ></button>
-    </aside>
+        <div class="wms-sidebar-footer">
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
+                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
 
-    <div class="wms-main-panel">
-        <header class="wms-desktop-topbar" role="banner">
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-topbar-brand" aria-label="{{ __('Warehouse Management System') }}">
-                <span class="wms-brand-mark">
-                    <span class="wms-brand-mark-inner">W</span>
-                </span>
+                    <div class="wms-user-copy">
+                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
+                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
+                    </div>
 
-                <span class="wms-brand-copy">
-                    <span class="wms-brand-title">{{ __('Warehouse Management System') }}</span>
-                    <span class="wms-brand-subtitle">MPBA</span>
-                </span>
-            </a>
-
-            <flux:dropdown position="bottom" align="end">
-                <button type="button" class="wms-topbar-user-button" aria-label="{{ __('Open account menu') }}">
-                    <span class="wms-topbar-user-copy">
-                        <span class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</span>
-                        <span class="wms-user-email">{{ auth()->user()?->email ?? '' }}</span>
-                    </span>
-
-                    <span class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</span>
-                    <i class="fa-solid fa-chevron-down wms-user-chevron" aria-hidden="true"></i>
+                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
                 </button>
 
                 <flux:menu>
@@ -669,8 +596,40 @@
                     </form>
                 </flux:menu>
             </flux:dropdown>
-        </header>
 
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
+                    {{ auth()->user()?->initials() ?? 'U' }}
+                </button>
+
+                <flux:menu>
+                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
+                        {{ __('Settings') }}
+                    </flux:menu.item>
+
+                    <flux:menu.separator />
+
+                    <form method="POST" action="{{ route('logout') }}" class="w-full">
+                        @csrf
+
+                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
+                            {{ __('Log out') }}
+                        </flux:menu.item>
+                    </form>
+                </flux:menu>
+            </flux:dropdown>
+        </div>
+
+        <button
+            type="button"
+            class="wms-sidebar-resizer"
+            data-wms-sidebar-resizer
+            aria-label="{{ __('Resize sidebar') }}"
+            title="{{ __('Drag to resize sidebar') }}"
+        ></button>
+    </aside>
+
+    <div class="wms-main-panel">
         <header class="wms-mobile-header" role="banner">
             <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
                 <i class="fa-solid fa-bars" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
index 168042eb..f3ca89a9 100644
--- a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
+++ b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
@@ -397,72 +397,19 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
-                        <span class="wms-sidebar-heading-content">
-                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                            <span>{{ __('Support') }}</span>
-                        </span>
-                    </button>
+                @if(Route::has('helpdesk.index'))
+                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
+                    </a>
+                @endif
 
-                    <div class="wms-sidebar-group-items" data-wms-menu-items>
-                        @if(Route::has('helpdesk.index'))
-                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.index'))
-                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
-                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.create'))
-                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
-                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskKanbanRoute)
-                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
-                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskGitRoute)
-                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
-                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskWorkflowRoute)
-                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
-                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
-                            </a>
-                        @endif
-
-                        @if($documentationRoute)
-                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskSettingsRoute)
-                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
-                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
-                            </a>
-                        @endif
-                    </div>
-                </div>
+                @if($documentationRoute)
+                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                    </a>
+                @endif
             @endif
 
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
@@ -599,37 +546,17 @@
             @endif
         </nav>
 
-        <button
-            type="button"
-            class="wms-sidebar-resizer"
-            data-wms-sidebar-resizer
-            aria-label="{{ __('Resize sidebar') }}"
-            title="{{ __('Drag to resize sidebar') }}"
-        ></button>
-    </aside>
+        <div class="wms-sidebar-footer">
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
+                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
 
-    <div class="wms-main-panel">
-        <header class="wms-desktop-topbar" role="banner">
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-topbar-brand" aria-label="{{ __('Warehouse Management System') }}">
-                <span class="wms-brand-mark">
-                    <span class="wms-brand-mark-inner">W</span>
-                </span>
+                    <div class="wms-user-copy">
+                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
+                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
+                    </div>
 
-                <span class="wms-brand-copy">
-                    <span class="wms-brand-title">{{ __('Warehouse Management System') }}</span>
-                    <span class="wms-brand-subtitle">MPBA</span>
-                </span>
-            </a>
-
-            <flux:dropdown position="bottom" align="end">
-                <button type="button" class="wms-topbar-user-button" aria-label="{{ __('Open account menu') }}">
-                    <span class="wms-topbar-user-copy">
-                        <span class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</span>
-                        <span class="wms-user-email">{{ auth()->user()?->email ?? '' }}</span>
-                    </span>
-
-                    <span class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</span>
-                    <i class="fa-solid fa-chevron-down wms-user-chevron" aria-hidden="true"></i>
+                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
                 </button>
 
                 <flux:menu>
@@ -663,8 +590,40 @@
                     </form>
                 </flux:menu>
             </flux:dropdown>
-        </header>
 
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
+                    {{ auth()->user()?->initials() ?? 'U' }}
+                </button>
+
+                <flux:menu>
+                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
+                        {{ __('Settings') }}
+                    </flux:menu.item>
+
+                    <flux:menu.separator />
+
+                    <form method="POST" action="{{ route('logout') }}" class="w-full">
+                        @csrf
+
+                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
+                            {{ __('Log out') }}
+                        </flux:menu.item>
+                    </form>
+                </flux:menu>
+            </flux:dropdown>
+        </div>
+
+        <button
+            type="button"
+            class="wms-sidebar-resizer"
+            data-wms-sidebar-resizer
+            aria-label="{{ __('Resize sidebar') }}"
+            title="{{ __('Drag to resize sidebar') }}"
+        ></button>
+    </aside>
+
+    <div class="wms-main-panel">
         <header class="wms-mobile-header" role="banner">
             <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
                 <i class="fa-solid fa-bars" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php b/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php
index 54363464..7d883443 100644
--- a/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php
+++ b/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php
@@ -8,33 +8,8 @@
 @endphp
 
 @if($helpdeskEnabled)
-    <div class="wms-sidebar-group">
-        <div class="wms-sidebar-heading" data-wms-sidebar-label>{{ __('Support') }}</div>
-
-        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk') }}">
-            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-            <span data-wms-sidebar-label>{{ __('Helpdesk') }}</span>
-        </a>
-
-        @if(Route::has('helpdesk.tickets.index'))
-            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.*')) is-active @endif" title="{{ __('Tickets') }}">
-                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-            </a>
-        @endif
-
-        @if(Route::has('helpdesk.kanban'))
-            <a href="{{ route('helpdesk.kanban') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban')) is-active @endif" title="{{ __('Kanban') }}">
-                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-            </a>
-        @endif
-
-        @if(Route::has('helpdesk.settings'))
-            <a href="{{ route('helpdesk.settings') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings')) is-active @endif" title="{{ __('Support Settings') }}">
-                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Support Settings') }}</span>
-            </a>
-        @endif
-    </div>
+    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+        <span data-wms-sidebar-label>{{ __('Support') }}</span>
+    </a>
 @endif
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index 7ab88555..ecc2e087 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -395,72 +395,19 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    <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">
-                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                            <span>{{ __('Support') }}</span>
-                        </span>
-                    </button>
+                @if(Route::has('helpdesk.index'))
+                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
+                    </a>
+                @endif
 
-                    <div class="wms-sidebar-group-items" data-wms-menu-items>
-                        @if(Route::has('helpdesk.index'))
-                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.index'))
-                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
-                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.create'))
-                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
-                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskKanbanRoute)
-                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
-                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskGitRoute)
-                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
-                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskWorkflowRoute)
-                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
-                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
-                            </a>
-                        @endif
-
-                        @if($documentationRoute)
-                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskSettingsRoute)
-                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
-                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
-                            </a>
-                        @endif
-                    </div>
-                </div>
+                @if($documentationRoute)
+                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                    </a>
+                @endif
             @endif
 
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
@@ -603,37 +550,17 @@
             @endif
         </nav>
 
-        <button
-            type="button"
-            class="wms-sidebar-resizer"
-            data-wms-sidebar-resizer
-            aria-label="{{ __('Resize sidebar') }}"
-            title="{{ __('Drag to resize sidebar') }}"
-        ></button>
-    </aside>
+        <div class="wms-sidebar-footer">
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
+                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
 
-    <div class="wms-main-panel">
-        <header class="wms-desktop-topbar" role="banner">
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-topbar-brand" aria-label="{{ __('Warehouse Management System') }}">
-                <span class="wms-brand-mark">
-                    <span class="wms-brand-mark-inner">W</span>
-                </span>
+                    <div class="wms-user-copy">
+                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
+                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
+                    </div>
 
-                <span class="wms-brand-copy">
-                    <span class="wms-brand-title">{{ __('Warehouse Management System') }}</span>
-                    <span class="wms-brand-subtitle">MPBA</span>
-                </span>
-            </a>
-
-            <flux:dropdown position="bottom" align="end">
-                <button type="button" class="wms-topbar-user-button" aria-label="{{ __('Open account menu') }}">
-                    <span class="wms-topbar-user-copy">
-                        <span class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</span>
-                        <span class="wms-user-email">{{ auth()->user()?->email ?? '' }}</span>
-                    </span>
-
-                    <span class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</span>
-                    <i class="fa-solid fa-chevron-down wms-user-chevron" aria-hidden="true"></i>
+                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
                 </button>
 
                 <flux:menu>
@@ -667,8 +594,40 @@
                     </form>
                 </flux:menu>
             </flux:dropdown>
-        </header>
 
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
+                    {{ auth()->user()?->initials() ?? 'U' }}
+                </button>
+
+                <flux:menu>
+                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
+                        {{ __('Settings') }}
+                    </flux:menu.item>
+
+                    <flux:menu.separator />
+
+                    <form method="POST" action="{{ route('logout') }}" class="w-full">
+                        @csrf
+
+                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
+                            {{ __('Log out') }}
+                        </flux:menu.item>
+                    </form>
+                </flux:menu>
+            </flux:dropdown>
+        </div>
+
+        <button
+            type="button"
+            class="wms-sidebar-resizer"
+            data-wms-sidebar-resizer
+            aria-label="{{ __('Resize sidebar') }}"
+            title="{{ __('Drag to resize sidebar') }}"
+        ></button>
+    </aside>
+
+    <div class="wms-main-panel">
         <header class="wms-mobile-header" role="banner">
             <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
                 <i class="fa-solid fa-bars" aria-hidden="true"></i>
diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php
index eadfda8a..2c8807cc 100644
--- a/resources/views/layouts/app/sidebar.blade.php
+++ b/resources/views/layouts/app/sidebar.blade.php
@@ -395,72 +395,19 @@
             @endphp
 
             @if($helpdeskEnabled || $documentationEnabled)
-                <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    <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">
-                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                            <span>{{ __('Support') }}</span>
-                        </span>
-                    </button>
+                @if(Route::has('helpdesk.index'))
+                    <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+                        <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Support') }}</span>
+                    </a>
+                @endif
 
-                    <div class="wms-sidebar-group-items" data-wms-menu-items>
-                        @if(Route::has('helpdesk.index'))
-                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.index'))
-                            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
-                                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-                            </a>
-                        @endif
-
-                        @if(Route::has('helpdesk.tickets.create'))
-                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
-                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskKanbanRoute)
-                            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
-                                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskGitRoute)
-                            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
-                                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskWorkflowRoute)
-                            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
-                                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
-                            </a>
-                        @endif
-
-                        @if($documentationRoute)
-                            <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
-                                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-                            </a>
-                        @endif
-
-                        @if($helpdeskSettingsRoute)
-                            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings') || request()->routeIs('helpdesk.settings.index')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
-                                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
-                            </a>
-                        @endif
-                    </div>
-                </div>
+                @if($documentationRoute)
+                    <a href="{{ route($documentationRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.*')) is-active @endif" title="{{ __('Documentation') }}">
+                        <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+                        <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+                    </a>
+                @endif
             @endif
 
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
@@ -597,37 +544,17 @@
             @endif
         </nav>
 
-        <button
-            type="button"
-            class="wms-sidebar-resizer"
-            data-wms-sidebar-resizer
-            aria-label="{{ __('Resize sidebar') }}"
-            title="{{ __('Drag to resize sidebar') }}"
-        ></button>
-    </aside>
+        <div class="wms-sidebar-footer">
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
+                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
 
-    <div class="wms-main-panel">
-        <header class="wms-desktop-topbar" role="banner">
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-topbar-brand" aria-label="{{ __('Warehouse Management System') }}">
-                <span class="wms-brand-mark">
-                    <span class="wms-brand-mark-inner">W</span>
-                </span>
+                    <div class="wms-user-copy">
+                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
+                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
+                    </div>
 
-                <span class="wms-brand-copy">
-                    <span class="wms-brand-title">{{ __('Warehouse Management System') }}</span>
-                    <span class="wms-brand-subtitle">MPBA</span>
-                </span>
-            </a>
-
-            <flux:dropdown position="bottom" align="end">
-                <button type="button" class="wms-topbar-user-button" aria-label="{{ __('Open account menu') }}">
-                    <span class="wms-topbar-user-copy">
-                        <span class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</span>
-                        <span class="wms-user-email">{{ auth()->user()?->email ?? '' }}</span>
-                    </span>
-
-                    <span class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</span>
-                    <i class="fa-solid fa-chevron-down wms-user-chevron" aria-hidden="true"></i>
+                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
                 </button>
 
                 <flux:menu>
@@ -661,8 +588,40 @@
                     </form>
                 </flux:menu>
             </flux:dropdown>
-        </header>
 
+            <flux:dropdown position="top" align="start">
+                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
+                    {{ auth()->user()?->initials() ?? 'U' }}
+                </button>
+
+                <flux:menu>
+                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
+                        {{ __('Settings') }}
+                    </flux:menu.item>
+
+                    <flux:menu.separator />
+
+                    <form method="POST" action="{{ route('logout') }}" class="w-full">
+                        @csrf
+
+                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
+                            {{ __('Log out') }}
+                        </flux:menu.item>
+                    </form>
+                </flux:menu>
+            </flux:dropdown>
+        </div>
+
+        <button
+            type="button"
+            class="wms-sidebar-resizer"
+            data-wms-sidebar-resizer
+            aria-label="{{ __('Resize sidebar') }}"
+            title="{{ __('Drag to resize sidebar') }}"
+        ></button>
+    </aside>
+
+    <div class="wms-main-panel">
         <header class="wms-mobile-header" role="banner">
             <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
                 <i class="fa-solid fa-bars" aria-hidden="true"></i>
diff --git a/resources/views/partials/wms-support-navigation.blade.php b/resources/views/partials/wms-support-navigation.blade.php
index 6d5c22d4..6c91ac27 100644
--- a/resources/views/partials/wms-support-navigation.blade.php
+++ b/resources/views/partials/wms-support-navigation.blade.php
@@ -33,78 +33,18 @@
 @endphp
 
 @if($helpdeskEnabled || $documentationEnabled)
-    <div class="wms-sidebar-group">
-        <div class="wms-sidebar-heading" data-wms-sidebar-label>{{ __('Support') }}</div>
+    @if(Route::has('helpdesk.index'))
+        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.*')) is-active @endif" title="{{ __('Support') }}">
+            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+            <span data-wms-sidebar-label>{{ __('Support') }}</span>
+        </a>
+    @endif
 
-        @if(Route::has('helpdesk.index'))
-            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
-                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
-            </a>
-        @endif
-
-        @if(Route::has('helpdesk.tickets.index'))
-            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.*')) is-active @endif" title="{{ __('Tickets') }}">
-                <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Tickets') }}</span>
-            </a>
-        @endif
-
-        @if(Route::has('helpdesk.tickets.create'))
-            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
-                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
-            </a>
-        @endif
-
-        @if($helpdeskKanbanRoute)
-            <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban*')) is-active @endif" title="{{ __('Kanban') }}">
-                <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Kanban') }}</span>
-            </a>
-        @endif
-
-        @if($helpdeskGitRoute)
-            <a href="{{ route($helpdeskGitRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.git.*')) is-active @endif" title="{{ __('Git Tracking') }}">
-                <i class="fa-solid fa-code-commit wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Git Tracking') }}</span>
-            </a>
-        @endif
-
-        @if($helpdeskWorkflowRoute)
-            <a href="{{ route($helpdeskWorkflowRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.workflow-templates.*')) is-active @endif" title="{{ __('Workflow Emails') }}">
-                <i class="fa-solid fa-envelope-circle-check wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Workflow Emails') }}</span>
-            </a>
-        @endif
-
-        @if($helpdeskSettingsRoute)
-            <a href="{{ route($helpdeskSettingsRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.settings*')) is-active @endif" title="{{ __('Helpdesk Settings') }}">
-                <i class="fa-solid fa-gears wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Settings') }}</span>
-            </a>
-        @endif
-
-        @if($documentationDashboardRoute)
-            <a href="{{ route($documentationDashboardRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.index') || request()->routeIs('documentation.documents.*')) is-active @endif" title="{{ __('Documentation') }}">
-                <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
-            </a>
-        @endif
-
-        @if($documentationCreateRoute)
-            <a href="{{ route($documentationCreateRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.documents.create')) is-active @endif" title="{{ __('New Document') }}">
-                <i class="fa-solid fa-file-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('New Document') }}</span>
-            </a>
-        @endif
-
-        @if($documentationCategoriesRoute)
-            <a href="{{ route($documentationCategoriesRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.categories.*')) is-active @endif" title="{{ __('Document Categories') }}">
-                <i class="fa-solid fa-folder-tree wms-sidebar-icon" aria-hidden="true"></i>
-                <span data-wms-sidebar-label>{{ __('Categories') }}</span>
-            </a>
-        @endif
-    </div>
+    @if($documentationDashboardRoute)
+        <a href="{{ route($documentationDashboardRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('documentation.index') || request()->routeIs('documentation.documents.*')) is-active @endif" title="{{ __('Documentation') }}">
+            <i class="fa-solid fa-book-open wms-sidebar-icon" aria-hidden="true"></i>
+            <span data-wms-sidebar-label>{{ __('Documentation') }}</span>
+        </a>
+    @endif
 @endif
 {{-- Support Portal end --}}