diff --git a/apps/console/src/App.tsx b/apps/console/src/App.tsx
index 704e4a967..5c118361f 100644
--- a/apps/console/src/App.tsx
+++ b/apps/console/src/App.tsx
@@ -63,271 +63,264 @@ function App() {
             <HelmetProvider>
               <BrowserRouter>
                 <Routes>
-                  {/* Authentication Routes - Accessible without login */}
-                  <Route
-                    element={
-                      <ErrorBoundaryWithLocation>
-                        <AuthLayout />
-                      </ErrorBoundaryWithLocation>
-                    }
-                  >
+                  <Route path="/*">
                     <Route
-                      path="login"
+                      index
                       element={
                         <Suspense>
                           <ErrorBoundaryWithLocation>
-                            <LoginPage />
+                            <OrganizationSelectionPage />
                           </ErrorBoundaryWithLocation>
                         </Suspense>
                       }
                     />
-                    <Route
-                      path="register"
-                      element={
-                        <Suspense>
-                          <ErrorBoundaryWithLocation>
-                            <RegisterPage />
-                          </ErrorBoundaryWithLocation>
-                        </Suspense>
-                      }
-                    />
-                    <Route
-                      path="confirm-email"
-                      element={
-                        <Suspense>
-                          <ErrorBoundaryWithLocation>
-                            <ConfirmEmailPage />
-                          </ErrorBoundaryWithLocation>
-                        </Suspense>
-                      }
-                    />
-                  </Route>
 
-                  <Route
-                    path="/"
-                    element={
-                      <Suspense>
-                        <ErrorBoundaryWithLocation>
-                          <OrganizationSelectionPage />
-                        </ErrorBoundaryWithLocation>
-                      </Suspense>
-                    }
-                  />
+                    <Route path="*" element={<ConsoleLayout />}>
+                      <Route path="organizations">
+                        <Route
+                          path="create"
+                          element={
+                            <Suspense>
+                              <ErrorBoundaryWithLocation>
+                                <CreateOrganizationPage />
+                              </ErrorBoundaryWithLocation>
+                            </Suspense>
+                          }
+                        />
+                        <Route path=":organizationId">
+                          <Route
+                            index
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <HomePage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="peoples"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <PeopleListPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="peoples/create"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <CreatePeoplePage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="peoples/:peopleId"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <PeopleOverviewPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="vendors"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <VendorListPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <FrameworkListPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/create"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <CreateFrameworkPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/:frameworkId"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <FrameworkOverviewPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/:frameworkId/update"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <UpdateFrameworkPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/:frameworkId/controls/create"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <CreateControlPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/:frameworkId/controls/:controlId"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <ControlOverviewPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="frameworks/:frameworkId/controls/:controlId/update"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <UpdateControlPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="vendors/:vendorId"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <VendorOverviewPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          {/* Policy Routes */}
+                          <Route
+                            path="policies"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <PolicyListPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="policies/create"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <CreatePolicyPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="policies/:policyId"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <PolicyOverviewPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="policies/:policyId/update"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <UpdatePolicyPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                          <Route
+                            path="settings"
+                            element={
+                              <Suspense>
+                                <ErrorBoundaryWithLocation>
+                                  <SettingsPage />
+                                </ErrorBoundaryWithLocation>
+                              </Suspense>
+                            }
+                          />
+                        </Route>
+                      </Route>
+                    </Route>
 
-                  <Route
-                    element={
-                      <Suspense>
+                    {/* Authentication Routes - Accessible without login */}
+                    <Route
+                      element={
                         <ErrorBoundaryWithLocation>
-                          <ConsoleLayout />
+                          <AuthLayout />
                         </ErrorBoundaryWithLocation>
-                      </Suspense>
-                    }
-                  >
-                    <Route path="organizations">
+                      }
+                    >
                       <Route
-                        path="create"
+                        path="login"
                         element={
                           <Suspense>
                             <ErrorBoundaryWithLocation>
-                              <CreateOrganizationPage />
+                              <LoginPage />
+                            </ErrorBoundaryWithLocation>
+                          </Suspense>
+                        }
+                      />
+                      <Route
+                        path="register"
+                        element={
+                          <Suspense>
+                            <ErrorBoundaryWithLocation>
+                              <RegisterPage />
+                            </ErrorBoundaryWithLocation>
+                          </Suspense>
+                        }
+                      />
+                      <Route
+                        path="confirm-email"
+                        element={
+                          <Suspense>
+                            <ErrorBoundaryWithLocation>
+                              <ConfirmEmailPage />
                             </ErrorBoundaryWithLocation>
                           </Suspense>
                         }
                       />
-                      <Route path=":organizationId">
-                        <Route
-                          index
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <HomePage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="peoples"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <PeopleListPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="peoples/create"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <CreatePeoplePage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="peoples/:peopleId"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <PeopleOverviewPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="vendors"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <VendorListPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <FrameworkListPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/create"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <CreateFrameworkPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/:frameworkId"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <FrameworkOverviewPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/:frameworkId/update"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <UpdateFrameworkPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/:frameworkId/controls/create"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <CreateControlPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/:frameworkId/controls/:controlId"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <ControlOverviewPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="frameworks/:frameworkId/controls/:controlId/update"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <UpdateControlPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="vendors/:vendorId"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <VendorOverviewPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        {/* Policy Routes */}
-                        <Route
-                          path="policies"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <PolicyListPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="policies/create"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <CreatePolicyPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="policies/:policyId"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <PolicyOverviewPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="policies/:policyId/update"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <UpdatePolicyPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                        <Route
-                          path="settings"
-                          element={
-                            <Suspense>
-                              <ErrorBoundaryWithLocation>
-                                <SettingsPage />
-                              </ErrorBoundaryWithLocation>
-                            </Suspense>
-                          }
-                        />
-                      </Route>
                     </Route>
-                  </Route>
 
-                  <Route
-                    path="*"
-                    element={
-                      <Suspense>
-                        <NotFoundPage />
-                      </Suspense>
-                    }
-                  />
+                    <Route
+                      element={
+                        <Suspense>
+                          <NotFoundPage />
+                        </Suspense>
+                      }
+                    />
+                  </Route>
                 </Routes>
               </BrowserRouter>
             </HelmetProvider>
diff --git a/apps/console/src/layouts/ConsoleLayout.tsx b/apps/console/src/layouts/ConsoleLayout.tsx
index 39bc3901d..5fc39298a 100644
--- a/apps/console/src/layouts/ConsoleLayout.tsx
+++ b/apps/console/src/layouts/ConsoleLayout.tsx
@@ -368,7 +368,9 @@ function BreadcrumbUpdatePolicy() {
 export default function ConsoleLayout() {
   return (
     <SidebarProvider>
-      <AppSidebar />
+      <Suspense>
+        <AppSidebar />
+      </Suspense>
       <SidebarInset>
         <header className="flex h-16 shrink-0 items-center gap-2">
           <div className="flex items-center gap-2 px-4">
@@ -467,6 +469,7 @@ export default function ConsoleLayout() {
                     }
                   />
                 </Route>
+
                 <Route path="*" element={<BreadcrumbHome />}>
                   <Route
                     path="create"