diff --git a/bootstrap/app.php b/bootstrap/app.php
index 241f9d6f..086fd568 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -74,10 +74,10 @@
                         ->setStatusCode($statusCode);
                 } else {
                     // Return JSON response for PrimeVue toast to display, handled by Inertia router event listener
-                    $errorSummary = "$statusCode - $errorTitles[$statusCode]";
+                    $errorSummary = "$errorTitles[$statusCode] - $statusCode";
                     $errorDetail = $errorDetails[$statusCode];
                     if (get_class($exception) === ErrorToastException::class) {
-                        $errorSummary = "$statusCode - Error";
+                        $errorSummary = "Error";
                         $errorDetail = $exception->getMessage();
                     }
                     return response()->json([
diff --git a/resources/js/components/PopupMenuButton.vue b/resources/js/components/PopupMenuButton.vue
index abef8475..d4588af4 100644
--- a/resources/js/components/PopupMenuButton.vue
+++ b/resources/js/components/PopupMenuButton.vue
@@ -7,7 +7,7 @@
  */
 
 import { computed, useTemplateRef } from 'vue'
-import Menu from '@/components/primevue/menu/Menu.vue'
+import Menu from '@/components/router-link-menus/Menu.vue'
 import Button, { type ButtonProps } from 'primevue/button'
 import { ChevronDown } from 'lucide-vue-next'
 import { MenuItem } from '@/types'
diff --git a/resources/js/components/primevue/menu/Breadcrumb.vue b/resources/js/components/router-link-menus/Breadcrumb.vue
similarity index 100%
rename from resources/js/components/primevue/menu/Breadcrumb.vue
rename to resources/js/components/router-link-menus/Breadcrumb.vue
diff --git a/resources/js/components/primevue/menu/ContextMenu.vue b/resources/js/components/router-link-menus/ContextMenu.vue
similarity index 100%
rename from resources/js/components/primevue/menu/ContextMenu.vue
rename to resources/js/components/router-link-menus/ContextMenu.vue
diff --git a/resources/js/components/primevue/menu/Menu.vue b/resources/js/components/router-link-menus/Menu.vue
similarity index 100%
rename from resources/js/components/primevue/menu/Menu.vue
rename to resources/js/components/router-link-menus/Menu.vue
diff --git a/resources/js/components/primevue/menu/Menubar.vue b/resources/js/components/router-link-menus/Menubar.vue
similarity index 100%
rename from resources/js/components/primevue/menu/Menubar.vue
rename to resources/js/components/router-link-menus/Menubar.vue
diff --git a/resources/js/components/primevue/menu/PanelMenu.vue b/resources/js/components/router-link-menus/PanelMenu.vue
similarity index 100%
rename from resources/js/components/primevue/menu/PanelMenu.vue
rename to resources/js/components/router-link-menus/PanelMenu.vue
diff --git a/resources/js/components/primevue/menu/TabMenu.vue b/resources/js/components/router-link-menus/TabMenu.vue
similarity index 100%
rename from resources/js/components/primevue/menu/TabMenu.vue
rename to resources/js/components/router-link-menus/TabMenu.vue
diff --git a/resources/js/components/primevue/menu/TieredMenu.vue b/resources/js/components/router-link-menus/TieredMenu.vue
similarity index 100%
rename from resources/js/components/primevue/menu/TieredMenu.vue
rename to resources/js/components/router-link-menus/TieredMenu.vue
diff --git a/resources/js/layouts/app/HeaderLayout.vue b/resources/js/layouts/app/HeaderLayout.vue
index a2d740de..19180aba 100644
--- a/resources/js/layouts/app/HeaderLayout.vue
+++ b/resources/js/layouts/app/HeaderLayout.vue
@@ -7,9 +7,9 @@ import Container from '@/components/Container.vue'
 import PopupMenuButton from '@/components/PopupMenuButton.vue'
 import NavLogoLink from '@/components/NavLogoLink.vue'
 import FlashMessages from '@/components/FlashMessages.vue'
-import Menubar from '@/components/primevue/menu/Menubar.vue'
-import PanelMenu from '@/components/primevue/menu/PanelMenu.vue'
-import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue'
+import Menubar from '@/components/router-link-menus/Menubar.vue'
+import PanelMenu from '@/components/router-link-menus/PanelMenu.vue'
+import Breadcrumb from '@/components/router-link-menus/Breadcrumb.vue'
 import { MenuItem } from '@/types'
 
 const props = withDefaults(defineProps<{
@@ -44,13 +44,13 @@ const {
                     </div>
                     <template #footer>
                         <PopupMenuButton
-                            class="w-full flex items-center justify-between gap-3"
+                            class="w-full flex items-center justify-between gap-2"
                             name="mobile-user-menu-dd"
                             severity="secondary"
                             size="large"
                             :menu-items="userMenuItems"
                         >
-                            <div class="flex items-center gap-3">
+                            <div class="flex items-center gap-2">
                                 <Tag
                                     v-if="page.props.auth.isAdmin"
                                     value="ADMIN"
@@ -87,13 +87,13 @@ const {
                             <!-- User Dropdown Menu -->
                             <div class="hidden lg:flex">
                                 <PopupMenuButton
-                                    class="w-full flex items-center justify-between gap-3"
+                                    class="w-full flex items-center justify-between gap-2"
                                     name="desktop-user-menu-dd"
                                     side="right"
                                     severity="secondary"
                                     :menu-items="userMenuItems"
                                 >
-                                    <div class="flex items-center gap-3">
+                                    <div class="flex items-center gap-2">
                                         <Tag
                                             v-if="page.props.auth.isAdmin"
                                             value="ADMIN"
diff --git a/resources/js/layouts/app/SidebarLayout.vue b/resources/js/layouts/app/SidebarLayout.vue
index 588d3864..dc218270 100644
--- a/resources/js/layouts/app/SidebarLayout.vue
+++ b/resources/js/layouts/app/SidebarLayout.vue
@@ -7,8 +7,8 @@ import Container from '@/components/Container.vue'
 import PopupMenuButton from '@/components/PopupMenuButton.vue'
 import FlashMessages from '@/components/FlashMessages.vue'
 import NavLogoLink from '@/components/NavLogoLink.vue'
-import PanelMenu from '@/components/primevue/menu/PanelMenu.vue'
-import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue'
+import PanelMenu from '@/components/router-link-menus/PanelMenu.vue'
+import Breadcrumb from '@/components/router-link-menus/Breadcrumb.vue'
 import { MenuItem } from '@/types'
 
 const props = withDefaults(defineProps<{
@@ -42,13 +42,13 @@ const {
                     </div>
                     <template #footer>
                         <PopupMenuButton
-                            class="w-full flex items-center justify-between gap-3"
+                            class="w-full flex items-center justify-between gap-2"
                             name="mobile-user-menu-dd"
                             severity="secondary"
                             size="large"
                             :menu-items="userMenuItems"
                         >
-                            <div class="flex items-center gap-3">
+                            <div class="flex items-center gap-2">
                                 <Tag
                                     v-if="page.props.auth.isAdmin"
                                     value="ADMIN"
@@ -111,12 +111,12 @@ const {
                     </div>
                     <div>
                         <PopupMenuButton
-                            class="w-full flex items-center justify-between gap-3"
+                            class="w-full flex items-center justify-between gap-2"
                             name="desktop-user-menu-dd"
                             severity="secondary"
                             :menu-items="userMenuItems"
                         >
-                            <div class="flex items-center gap-3">
+                            <div class="flex items-center gap-2">
                                 <Tag
                                     v-if="page.props.auth.isAdmin"
                                     value="ADMIN"
diff --git a/resources/js/pages/admin/users/Index.vue b/resources/js/pages/admin/users/Index.vue
index a1e42a7d..1219545c 100644
--- a/resources/js/pages/admin/users/Index.vue
+++ b/resources/js/pages/admin/users/Index.vue
@@ -9,7 +9,7 @@ import { usePaginatedDataTable } from '@/composables/usePaginatedDataTable'
 import AppLayout from '@/layouts/AppLayout.vue'
 import PageTitleSection from '@/components/PageTitleSection.vue'
 import ClientOnly from '@/components/ClientOnly.vue'
-import Menu from '@/components/primevue/menu/Menu.vue'
+import Menu from '@/components/router-link-menus/Menu.vue'
 import { LengthAwarePaginator } from '@/types/paginiation'
 import { MenuItem, User } from '@/types'