diff --git a/src/components/layout/AppSidebar.vue b/src/components/layout/AppSidebar.vue
index 80606eb..351ef6a 100644
--- a/src/components/layout/AppSidebar.vue
+++ b/src/components/layout/AppSidebar.vue
@@ -9,7 +9,7 @@ import {
   Calendar,
   ShoppingBag,
   MessageSquare,
-  // Settings, // TODO: Uncomment when Settings page is implemented
+  Settings,
   Sun,
   Moon
 } from 'lucide-vue-next'
@@ -115,7 +115,7 @@ const isActive = (href: string) => {
             <LanguageSwitcher />
           </div>
 
-          <!-- TODO: Review implementing Settings page in the future
+          <!-- Settings Link -->
           <router-link
             to="/settings"
             :class="[
@@ -128,7 +128,6 @@ const isActive = (href: string) => {
             <Settings class="h-5 w-5 shrink-0" />
             Settings
           </router-link>
-          -->
         </li>
       </ul>
     </nav>
diff --git a/src/components/layout/AppTopBar.vue b/src/components/layout/AppTopBar.vue
index eb1fe00..3fae1d2 100644
--- a/src/components/layout/AppTopBar.vue
+++ b/src/components/layout/AppTopBar.vue
@@ -170,7 +170,7 @@ const navigateToNotifications = () => {
                 </span>
               </Button>
             </DropdownMenuTrigger>
-            <DropdownMenuContent align="end" class="w-64">
+            <DropdownMenuContent align="end" class="w-56">
               <!-- Wallet Balance -->
               <DropdownMenuItem @click="() => router.push('/wallet')" class="gap-2">
                 <Wallet class="h-4 w-4 text-muted-foreground" />
diff --git a/src/components/layout/MobileDrawer.vue b/src/components/layout/MobileDrawer.vue
index 87b2dd1..20c4dad 100644
--- a/src/components/layout/MobileDrawer.vue
+++ b/src/components/layout/MobileDrawer.vue
@@ -10,13 +10,13 @@ import {
   SheetTitle,
 } from '@/components/ui/sheet'
 import { Button } from '@/components/ui/button'
-// import { Separator } from '@/components/ui/separator' // TODO: Uncomment when Settings page is implemented
+import { Separator } from '@/components/ui/separator'
 import {
   Home,
   Calendar,
   ShoppingBag,
   MessageSquare,
-  // Settings, // TODO: Uncomment when Settings page is implemented
+  Settings,
   Sun,
   Moon,
 } from 'lucide-vue-next'
@@ -136,9 +136,9 @@ const navigateTo = (href: string) => {
             <LanguageSwitcher />
           </div>
 
-          <!-- TODO: Review implementing Settings page in the future
           <Separator />
 
+          <!-- Settings Link -->
           <button
             @click="navigateTo('/settings')"
             :class="[
@@ -151,7 +151,6 @@ const navigateTo = (href: string) => {
             <Settings class="h-5 w-5 shrink-0" />
             Settings
           </button>
-          -->
         </div>
       </div>
     </SheetContent>
diff --git a/src/composables/useModularNavigation.ts b/src/composables/useModularNavigation.ts
index e48f209..af47f66 100644
--- a/src/composables/useModularNavigation.ts
+++ b/src/composables/useModularNavigation.ts
@@ -79,13 +79,13 @@ export function useModularNavigation() {
       })
     }
 
-    // TODO: Review implementing Relay Hub Status page in the future
-    // items.push({
-    //   name: 'Relay Hub Status',
-    //   href: '/relay-hub-status',
-    //   icon: 'Activity',
-    //   requiresAuth: true
-    // })
+    // Base module items (always available)
+    items.push({ 
+      name: 'Relay Hub Status', 
+      href: '/relay-hub-status', 
+      icon: 'Activity',
+      requiresAuth: true 
+    })
 
     return items
   })