diff --git a/mcpjam-inspector/client/src/App.tsx b/mcpjam-inspector/client/src/App.tsx
index fa6cf01ef..898f5800b 100644
--- a/mcpjam-inspector/client/src/App.tsx
+++ b/mcpjam-inspector/client/src/App.tsx
@@ -21,7 +21,6 @@ import { OAuthFlowTab } from "./components/OAuthFlowTab";
 import { AppBuilderTab } from "./components/ui-playground/AppBuilderTab";
 import { ProfileTab } from "./components/ProfileTab";
 import { OrganizationsTab } from "./components/OrganizationsTab";
-import { SupportTab } from "./components/SupportTab";
 import OAuthDebugCallback from "./components/oauth/OAuthDebugCallback";
 import { MCPSidebar } from "./components/mcp-sidebar";
 import { SidebarInset, SidebarProvider } from "./components/ui/sidebar";
@@ -775,7 +774,6 @@ export default function App() {
               workspaceName={activeWorkspace?.name ?? null}
             />
           )}
-          {activeTab === "support" && <SupportTab />}
           {activeTab === "profile" && <ProfileTab />}
           {activeTab === "organizations" && (
             <OrganizationsTab organizationId={activeOrganizationId} />
diff --git a/mcpjam-inspector/client/src/__tests__/App.hosted-oauth.test.tsx b/mcpjam-inspector/client/src/__tests__/App.hosted-oauth.test.tsx
index 270c90a70..273e27100 100644
--- a/mcpjam-inspector/client/src/__tests__/App.hosted-oauth.test.tsx
+++ b/mcpjam-inspector/client/src/__tests__/App.hosted-oauth.test.tsx
@@ -175,9 +175,6 @@ vi.mock("../components/ProfileTab", () => ({
 vi.mock("../components/OrganizationsTab", () => ({
   OrganizationsTab: () => <div />,
 }));
-vi.mock("../components/SupportTab", () => ({
-  SupportTab: () => <div />,
-}));
 vi.mock("../components/oauth/OAuthDebugCallback", () => ({
   default: () => <div />,
 }));
diff --git a/mcpjam-inspector/client/src/components/SupportTab.tsx b/mcpjam-inspector/client/src/components/SupportTab.tsx
deleted file mode 100644
index c5306bbf8..000000000
--- a/mcpjam-inspector/client/src/components/SupportTab.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { BookOpen, ExternalLink } from "lucide-react";
-import { DiscordIcon } from "@/components/ui/discord-icon";
-import { GitHubIcon } from "@/components/ui/github-icon";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
-import { Button } from "@/components/ui/button";
-
-const supportLinks = [
-  {
-    title: "Discord Community",
-    description:
-      "Project maintainers are active on our Discord server. Get quick help here.",
-    href: "https://discord.gg/JEnDtz8X6z",
-    cta: "Join Discord",
-    icon: DiscordIcon,
-  },
-  {
-    title: "Documentation",
-    description: "Browse setup guides and reference docs.",
-    href: "https://docs.mcpjam.com/",
-    cta: "Open Docs",
-    icon: BookOpen,
-  },
-  {
-    title: "Report an Issue",
-    description: "File a bug or request an improvement on GitHub.",
-    href: "https://github.com/MCPJam/inspector/issues/new",
-    cta: "Open Issue",
-    icon: GitHubIcon,
-  },
-];
-
-export function SupportTab() {
-  return (
-    <div className="h-full w-full overflow-auto">
-      <div className="mx-auto flex min-h-full w-full max-w-6xl items-center justify-center p-6 md:p-10">
-        <div className="w-full max-w-5xl space-y-5">
-          <div className="grid w-full gap-6 md:grid-cols-3">
-            {supportLinks.map((item) => {
-              const Icon = item.icon;
-              return (
-                <Card
-                  key={item.title}
-                  className="flex h-full flex-col justify-between border-border/60"
-                >
-                  <CardHeader>
-                    <Icon className="mb-2 size-6 text-muted-foreground" />
-                    <CardTitle>{item.title}</CardTitle>
-                    <CardDescription>{item.description}</CardDescription>
-                  </CardHeader>
-                  <CardContent>
-                    <Button asChild className="w-full">
-                      <a
-                        href={item.href}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        {item.cta}
-                        <ExternalLink className="size-4" />
-                      </a>
-                    </Button>
-                  </CardContent>
-                </Card>
-              );
-            })}
-          </div>
-          <p className="text-center text-sm text-muted-foreground">
-            or email us at{" "}
-            <a className="underline" href="mailto:founders@mcpjam.com">
-              founders@mcpjam.com
-            </a>
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/mcpjam-inspector/client/src/components/auth/auth-upper-area.tsx b/mcpjam-inspector/client/src/components/auth/auth-upper-area.tsx
index 75e6d9757..51d750f50 100644
--- a/mcpjam-inspector/client/src/components/auth/auth-upper-area.tsx
+++ b/mcpjam-inspector/client/src/components/auth/auth-upper-area.tsx
@@ -4,12 +4,19 @@ import { usePostHog } from "posthog-js/react";
 import { Button } from "@/components/ui/button";
 import { DiscordIcon } from "@/components/ui/discord-icon";
 import { GitHubIcon } from "@/components/ui/github-icon";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 import {
   ActiveServerSelector,
   ActiveServerSelectorProps,
 } from "@/components/ActiveServerSelector";
 import { NotificationBell } from "@/components/notifications/NotificationBell";
 import { detectEnvironment, detectPlatform } from "@/lib/PosthogUtils";
+import { Bug, CircleHelp, ExternalLink, BookOpenText } from "lucide-react";
 
 interface AuthUpperAreaProps {
   activeServerSelectorProps?: ActiveServerSelectorProps;
@@ -22,35 +29,6 @@ export function AuthUpperArea({
   const { isLoading } = useConvexAuth();
   const posthog = usePostHog();
 
-  const communityLinks = (
-    <div className="flex items-center gap-1">
-      <Button asChild size="icon" variant="ghost">
-        <a
-          href="https://discord.gg/JEnDtz8X6z"
-          target="_blank"
-          rel="noreferrer"
-          aria-label="Join the Discord community"
-          title="Join the Discord community"
-        >
-          <DiscordIcon className="h-10 w-10" />
-          <span className="sr-only">Discord</span>
-        </a>
-      </Button>
-      <Button asChild size="icon" variant="ghost">
-        <a
-          href="https://github.com/MCPJam/inspector"
-          target="_blank"
-          rel="noreferrer"
-          aria-label="Visit the GitHub repository"
-          title="Visit the GitHub repository"
-        >
-          <GitHubIcon className="h-10 w-10" />
-          <span className="sr-only">GitHub</span>
-        </a>
-      </Button>
-    </div>
-  );
-
   return (
     <div className="ml-auto flex h-full flex-1 items-center gap-2 no-drag min-w-0">
       {activeServerSelectorProps && (
@@ -62,10 +40,63 @@ export function AuthUpperArea({
         </div>
       )}
       <div className="ml-auto flex items-center gap-2 shrink-0">
-        {communityLinks}
+        <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button size="icon" variant="ghost" aria-label="Help & support">
+                <CircleHelp className="h-5 w-5" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end" sideOffset={4}>
+              <DropdownMenuItem asChild>
+                <a
+                  href="https://docs.mcpjam.com/"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <BookOpenText className="size-4" />
+                  Documentation
+                  <ExternalLink className="ml-auto size-3 text-muted-foreground" />
+                </a>
+              </DropdownMenuItem>
+              <DropdownMenuItem asChild>
+                <a
+                  href="https://discord.gg/JEnDtz8X6z"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <DiscordIcon className="size-4" />
+                  Discord community
+                  <ExternalLink className="ml-auto size-3 text-muted-foreground" />
+                </a>
+              </DropdownMenuItem>
+              <DropdownMenuItem asChild>
+                <a
+                  href="https://github.com/MCPJam/inspector/issues/new"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <Bug className="size-4" />
+                  Report a bug
+                  <ExternalLink className="ml-auto size-3 text-muted-foreground" />
+                </a>
+              </DropdownMenuItem>
+              <DropdownMenuItem asChild>
+                <a
+                  href="https://github.com/MCPJam/inspector"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <GitHubIcon className="size-4" />
+                  GitHub repository
+                  <ExternalLink className="ml-auto size-3 text-muted-foreground" />
+                </a>
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
         <NotificationBell />
         {!user && !isLoading && (
           <>
+            <div className="h-6 w-px bg-border/60" />
             <Button
               variant="outline"
               size="sm"
diff --git a/mcpjam-inspector/client/src/components/mcp-sidebar.tsx b/mcpjam-inspector/client/src/components/mcp-sidebar.tsx
index 2d5526c97..b85ee04fe 100644
--- a/mcpjam-inspector/client/src/components/mcp-sidebar.tsx
+++ b/mcpjam-inspector/client/src/components/mcp-sidebar.tsx
@@ -3,7 +3,6 @@ import { useState, useEffect, useMemo } from "react";
 import {
   Hammer,
   MessageCircle,
-  Settings,
   MessageSquareCode,
   BookOpen,
   FlaskConical,
@@ -12,7 +11,6 @@ import {
   Layers,
   ListTodo,
   SquareSlash,
-  MessageCircleQuestionIcon,
   GitBranch,
   GraduationCap,
   Box,
@@ -185,21 +183,6 @@ const navigationSections: NavSection[] = [
       },
     ],
   },
-  {
-    id: "settings",
-    items: [
-      {
-        title: "Support",
-        url: "#support",
-        icon: MessageCircleQuestionIcon,
-      },
-      {
-        title: "Settings",
-        url: "#settings",
-        icon: Settings,
-      },
-    ],
-  },
 ];
 
 const hostedNavigationSections = navigationSections
diff --git a/mcpjam-inspector/client/src/components/sidebar/sidebar-user.tsx b/mcpjam-inspector/client/src/components/sidebar/sidebar-user.tsx
index f63f71e74..901aaa862 100644
--- a/mcpjam-inspector/client/src/components/sidebar/sidebar-user.tsx
+++ b/mcpjam-inspector/client/src/components/sidebar/sidebar-user.tsx
@@ -120,9 +120,6 @@ export function SidebarUser() {
                 </Avatar>
                 <div className="grid flex-1 text-left text-sm leading-tight group-data-[collapsible=icon]:hidden">
                   <span className="truncate font-semibold">{displayName}</span>
-                  <span className="truncate text-xs text-muted-foreground">
-                    {email}
-                  </span>
                 </div>
                 <ChevronsUpDown className="ml-auto size-4 group-data-[collapsible=icon]:hidden" />
               </SidebarMenuButton>
@@ -191,13 +188,6 @@ export function SidebarUser() {
                       </AvatarFallback>
                     </Avatar>
                     <span className="flex-1 truncate">{org.name}</span>
-                    <Settings
-                      className="size-4 text-muted-foreground hover:text-foreground"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        window.location.hash = `organizations/${org._id}`;
-                      }}
-                    />
                   </DropdownMenuItem>
                 ))
               ) : (
diff --git a/mcpjam-inspector/client/src/lib/hosted-tab-policy.ts b/mcpjam-inspector/client/src/lib/hosted-tab-policy.ts
index 5edff9960..4723ee6de 100644
--- a/mcpjam-inspector/client/src/lib/hosted-tab-policy.ts
+++ b/mcpjam-inspector/client/src/lib/hosted-tab-policy.ts
@@ -13,7 +13,6 @@ export const HOSTED_SIDEBAR_ALLOWED_TABS = [
   "tools",
   "resources",
   "prompts",
-  "support",
   "settings",
   "oauth-flow",
   "learning",