diff --git a/apps/main/pages/_app.tsx b/apps/main/pages/_app.tsx
index 9dab0216c..e69504808 100644
--- a/apps/main/pages/_app.tsx
+++ b/apps/main/pages/_app.tsx
@@ -205,6 +205,7 @@ export default function NeuroSanUI({Component, pageProps}: ExtendedAppProps): Re
             if (!res.ok) {
                 // This is bad: it means we saw the ALB header, but it's not in the right format so we're stuck
                 console.error(`Failed to fetch user info: ${res.status} ${res.statusText}`)
+                return
             }
 
             const response: UserInfoResponse = await res.json()
diff --git a/apps/main/pages/index.tsx b/apps/main/pages/index.tsx
index d76770174..934e56cbb 100644
--- a/apps/main/pages/index.tsx
+++ b/apps/main/pages/index.tsx
@@ -212,7 +212,7 @@ export default function Index(): ReactElement {
                                     id="explore-agent-networks-link-anchor"
                                     target="_blank"
                                     rel="noopener noreferrer"
-                                    href={`/projects?${buildQueryString()}`}
+                                    href="#"
                                 >
                                     <LaunchButton id="neuro-san-button">Explore agent networks</LaunchButton>
                                 </a>
diff --git a/packages/ui-common/components/Common/Navbar.tsx b/packages/ui-common/components/Common/Navbar.tsx
index 624919558..7d9541100 100644
--- a/packages/ui-common/components/Common/Navbar.tsx
+++ b/packages/ui-common/components/Common/Navbar.tsx
@@ -73,6 +73,9 @@ export interface NavbarProps {
 
     // Optional logo.dev token for customer branding
     readonly logoServiceToken?: string
+
+    // Optional flag to show/hide the settings button, defaults to true
+    readonly showSettingsButton?: boolean
 }
 
 const MENU_ITEM_TEXT_PROPS = {
@@ -99,6 +102,7 @@ export const Navbar = ({
     logoServiceToken,
     pathname,
     query,
+    showSettingsButton = true,
     signOut,
     supportEmailAddress,
     userInfo,
@@ -452,19 +456,21 @@ export const Navbar = ({
                 />
             </Tooltip>
             {/* Settings */}
-            <Tooltip title="Settings">
-                <SettingsIcon
-                    sx={{
-                        ...MENU_ITEM_TEXT_PROPS,
-                        marginRight: "1rem",
-                        fontSize: "1rem",
-                        cursor: "pointer",
-                    }}
-                    onClick={() => {
-                        setSettingsDialogOpen(true)
-                    }}
-                />
-            </Tooltip>
+            {showSettingsButton && (
+                <Tooltip title="Settings">
+                    <SettingsIcon
+                        sx={{
+                            ...MENU_ITEM_TEXT_PROPS,
+                            marginRight: "1rem",
+                            fontSize: "1rem",
+                            cursor: "pointer",
+                        }}
+                        onClick={() => {
+                            setSettingsDialogOpen(true)
+                        }}
+                    />
+                </Tooltip>
+            )}
         </Grid>
     ) : (
         <LoadingSpinner id="navbar-loading-spinner" />
diff --git a/packages/ui-common/index.ts b/packages/ui-common/index.ts
index 6fab98ec4..479b78b3d 100644
--- a/packages/ui-common/index.ts
+++ b/packages/ui-common/index.ts
@@ -18,6 +18,7 @@ limitations under the License.
  * Export modules so they can be imported with simpler paths in the consumer
  */
 
+export * from "./Theme/Theme"
 export * from "./components/AgentChat/ChatCommon"
 export * from "./components/AgentChat/ControlButtons"
 export * from "./components/AgentChat/LlmChatButton"
@@ -49,6 +50,7 @@ export * from "./controller/agent/Agent"
 export * from "./controller/llm/LlmChat"
 export * from "./generated/neuro-san/NeuroSanClient"
 export * from "./state/Environment"
+export * from "./state/Settings"
 export * from "./state/UserInfo"
 export * from "./utils/Authentication"
 export * from "./utils/text"
diff --git a/packages/ui-common/package.json b/packages/ui-common/package.json
index d4e7d4503..667d61e25 100644
--- a/packages/ui-common/package.json
+++ b/packages/ui-common/package.json
@@ -16,7 +16,6 @@
         "jsonrepair": "3.8.0",
         "lodash-es": "4.17.23",
         "next": "16.1.6",
-        "next-auth": "5.0.0-beta.30",
         "notistack": "3.0.2",
         "react-dom": "19.2.4",
         "react-markdown": "10.1.0",
@@ -43,7 +42,9 @@
         "@emotion/styled": "^11.13.0",
         "@mui/icons-material": "^7.3.1",
         "@mui/material": "^7.3.1",
+        "@mui/system": "^7.3.1",
         "@mui/x-tree-view": "^8.22.0",
+        "next-auth": "5.0.0-beta.30",
         "react": "^19.2.4",
         "react-dom": "^19.2.4",
         "typescript": "^5.9.2"
diff --git a/yarn.lock b/yarn.lock
index 49b98c7cf..0fa5adb86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1639,7 +1639,6 @@ __metadata:
     jsonrepair: "npm:3.8.0"
     lodash-es: "npm:4.17.23"
     next: "npm:16.1.6"
-    next-auth: "npm:5.0.0-beta.30"
     notistack: "npm:3.0.2"
     openapi-typescript: "npm:7.8.0"
     react-dom: "npm:19.2.4"
@@ -1653,7 +1652,9 @@ __metadata:
     "@emotion/styled": ^11.13.0
     "@mui/icons-material": ^7.3.1
     "@mui/material": ^7.3.1
+    "@mui/system": ^7.3.1
     "@mui/x-tree-view": ^8.22.0
+    next-auth: 5.0.0-beta.30
     react: ^19.2.4
     react-dom: ^19.2.4
     typescript: ^5.9.2