diff --git a/src/App.tsx b/src/App.tsx
index 6a04477..93853b4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -19,7 +19,8 @@ import { buildSearchData } from './mocks/searchData'
 import { exchanges } from './mocks/exchanges'
 import { routes } from './mocks/routes'
 import { agents } from './mocks/agents'
-import { SIDEBAR_APPS, buildRouteToAppMap } from './mocks/sidebar'
+import { buildRouteToAppMap } from './mocks/sidebar'
+import { LayoutShell } from './layout/LayoutShell'
 
 const routeToApp = buildRouteToAppMap()
 
@@ -78,21 +79,23 @@ export default function App() {
   return (
     <>
       <Routes>
-        <Route path="/" element={<Navigate to="/apps" replace />} />
-        <Route path="/apps" element={<Dashboard />} />
-        <Route path="/apps/:id" element={<Dashboard />} />
-        <Route path="/apps/:id/:routeId" element={<Dashboard />} />
-        <Route path="/routes" element={<RoutesPage />} />
-        <Route path="/routes/:appId" element={<RoutesPage />} />
-        <Route path="/routes/:appId/:routeId" element={<RoutesPage />} />
-        <Route path="/exchanges/:id" element={<ExchangeDetail />} />
-        <Route path="/agents/:appId/:instanceId" element={<AgentInstance />} />
-        <Route path="/agents/*" element={<AgentHealth />} />
-        <Route path="/admin" element={<Navigate to="/admin/rbac" replace />} />
-        <Route path="/admin/audit" element={<AuditLog />} />
-        <Route path="/admin/oidc" element={<OidcConfig />} />
-        <Route path="/admin/rbac" element={<UserManagement />} />
-        <Route path="/api-docs" element={<ApiDocs />} />
+        <Route element={<LayoutShell />}>
+          <Route path="/" element={<Navigate to="/apps" replace />} />
+          <Route path="/apps" element={<Dashboard />} />
+          <Route path="/apps/:id" element={<Dashboard />} />
+          <Route path="/apps/:id/:routeId" element={<Dashboard />} />
+          <Route path="/routes" element={<RoutesPage />} />
+          <Route path="/routes/:appId" element={<RoutesPage />} />
+          <Route path="/routes/:appId/:routeId" element={<RoutesPage />} />
+          <Route path="/exchanges/:id" element={<ExchangeDetail />} />
+          <Route path="/agents/:appId/:instanceId" element={<AgentInstance />} />
+          <Route path="/agents/*" element={<AgentHealth />} />
+          <Route path="/admin" element={<Navigate to="/admin/rbac" replace />} />
+          <Route path="/admin/audit" element={<AuditLog />} />
+          <Route path="/admin/oidc" element={<OidcConfig />} />
+          <Route path="/admin/rbac" element={<UserManagement />} />
+          <Route path="/api-docs" element={<ApiDocs />} />
+        </Route>
         <Route path="/inventory" element={<Inventory />} />
       </Routes>
       <CommandPalette