diff --git a/app/[lang]/admin/page.tsx b/app/[lang]/admin/page.tsx
index f6db0d9..cf77222 100644
--- a/app/[lang]/admin/page.tsx
+++ b/app/[lang]/admin/page.tsx
@@ -12,6 +12,7 @@ import {
     ShieldCheck,
 } from "lucide-react"
 import { useCallback, useEffect, useMemo, useRef, useState } from "react"
+import { ProviderLogo } from "@/components/provider-logo"
 import { Button } from "@/components/ui/button"
 import {
     Collapsible,
@@ -33,8 +34,10 @@ import {
     SETTING_GROUPS,
     SETTINGS_REGISTRY,
     type SettingDef,
+    SUBGROUP_PROVIDERS,
 } from "@/lib/admin/settings-registry"
 import { getApiEndpoint } from "@/lib/base-path"
+import type { ProviderName } from "@/lib/types/model-config"
 import { cn } from "@/lib/utils"
 
 const SESSION_PASSWORD_KEY = "next-ai-draw-io-admin-password"
@@ -327,6 +330,11 @@ function ProviderSubgroup({
                         )}
                         aria-hidden="true"
                     />
+                    {SUBGROUP_PROVIDERS[name] && (
+                        <ProviderLogo
+                            provider={SUBGROUP_PROVIDERS[name] as ProviderName}
+                        />
+                    )}
                     {name}
                 </span>
                 {configured && (
@@ -365,6 +373,8 @@ export default function AdminPage() {
     const [errors, setErrors] = useState<Record<string, string>>({})
     const [saving, setSaving] = useState(false)
     const [saveMessage, setSaveMessage] = useState("")
+    const [justSaved, setJustSaved] = useState(false)
+    const [activeGroup, setActiveGroup] = useState(SETTING_GROUPS[0].id)
     const mainRef = useRef<HTMLDivElement>(null)
 
     const dirtyCount = Object.keys(pending).length
@@ -429,6 +439,29 @@ export default function AdminPage() {
         return () => window.removeEventListener("beforeunload", handler)
     }, [dirtyCount])
 
+    // Highlight the section currently in view in the sidebar
+    useEffect(() => {
+        if (!authedPassword) return
+        const observer = new IntersectionObserver(
+            (entries) => {
+                const visible = entries
+                    .filter((e) => e.isIntersecting)
+                    .sort(
+                        (a, b) =>
+                            a.boundingClientRect.top - b.boundingClientRect.top,
+                    )
+                if (visible[0]) setActiveGroup(visible[0].target.id)
+            },
+            // Track which section heading is in the top half of the viewport
+            { rootMargin: "-10% 0px -50% 0px" },
+        )
+        for (const group of SETTING_GROUPS) {
+            const el = document.getElementById(group.id)
+            if (el) observer.observe(el)
+        }
+        return () => observer.disconnect()
+    }, [authedPassword])
+
     const handleChange = useCallback(
         (key: string, value: string | null) => {
             setSaveMessage("")
@@ -494,6 +527,11 @@ export default function AdminPage() {
             applyResponse(data)
             setPending({})
             setSaveMessage("Settings saved. Changes apply immediately.")
+            setJustSaved(true)
+            setTimeout(() => {
+                setJustSaved(false)
+                setSaveMessage("")
+            }, 4000)
         } catch {
             setSaveMessage(
                 "Save failed: network error. Check your connection and try again.",
@@ -585,7 +623,7 @@ export default function AdminPage() {
     return (
         <div className="min-h-screen bg-background">
             <header className="sticky top-0 z-20 border-b bg-background/95 backdrop-blur">
-                <div className="mx-auto flex max-w-5xl items-center justify-between px-4 py-3">
+                <div className="mx-auto flex max-w-6xl items-center justify-between px-4 py-3">
                     <div className="flex items-center gap-2">
                         <ShieldCheck
                             className="h-5 w-5 text-primary"
@@ -603,7 +641,7 @@ export default function AdminPage() {
 
             {!writable && (
                 <div className="border-b bg-amber-500/10">
-                    <div className="mx-auto flex max-w-5xl items-center gap-2 px-4 py-3 text-sm text-amber-700 dark:text-amber-400">
+                    <div className="mx-auto flex max-w-6xl items-center gap-2 px-4 py-3 text-sm text-amber-700 dark:text-amber-400">
                         <AlertTriangle
                             className="h-4 w-4 shrink-0"
                             aria-hidden="true"
@@ -616,7 +654,7 @@ export default function AdminPage() {
                 </div>
             )}
 
-            <div className="mx-auto flex max-w-5xl gap-8 px-4 py-6">
+            <div className="mx-auto flex max-w-6xl gap-8 px-4 py-6">
                 <nav
                     aria-label="Setting groups"
                     className="sticky top-20 hidden h-fit w-44 shrink-0 md:block"
@@ -626,7 +664,17 @@ export default function AdminPage() {
                             <li key={group.id}>
                                 <a
                                     href={`#${group.id}`}
-                                    className="block rounded-md px-3 py-1.5 text-sm text-muted-foreground hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                                    aria-current={
+                                        activeGroup === group.id
+                                            ? "true"
+                                            : undefined
+                                    }
+                                    className={cn(
+                                        "block rounded-md px-3 py-1.5 text-sm hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+                                        activeGroup === group.id
+                                            ? "bg-muted font-medium text-foreground"
+                                            : "text-muted-foreground",
+                                    )}
                                 >
                                     {group.title}
                                 </a>
@@ -700,8 +748,21 @@ export default function AdminPage() {
 
             {(dirtyCount > 0 || saveMessage) && (
                 <div className="fixed inset-x-0 bottom-0 z-30 border-t bg-background/95 backdrop-blur">
-                    <div className="mx-auto flex max-w-5xl items-center justify-between gap-4 px-4 py-3">
-                        <p className="min-w-0 truncate text-sm text-muted-foreground">
+                    <div className="mx-auto flex max-w-6xl items-center justify-between gap-4 px-4 py-3">
+                        <p
+                            className={cn(
+                                "flex min-w-0 items-center gap-1.5 truncate text-sm",
+                                justSaved
+                                    ? "text-green-600 dark:text-green-400"
+                                    : "text-muted-foreground",
+                            )}
+                        >
+                            {justSaved && (
+                                <Check
+                                    className="h-4 w-4 shrink-0"
+                                    aria-hidden="true"
+                                />
+                            )}
                             {dirtyCount > 0
                                 ? `${dirtyCount} unsaved ${dirtyCount === 1 ? "change" : "changes"}`
                                 : saveMessage}
diff --git a/components/model-config-dialog.tsx b/components/model-config-dialog.tsx
index d381761..9a3cb58 100644
--- a/components/model-config-dialog.tsx
+++ b/components/model-config-dialog.tsx
@@ -5,7 +5,6 @@ import {
     Check,
     ChevronRight,
     Clock,
-    Cloud,
     Eye,
     EyeOff,
     Key,
@@ -21,6 +20,7 @@ import {
     Zap,
 } from "lucide-react"
 import { useCallback, useEffect, useRef, useState } from "react"
+import { ProviderLogo } from "@/components/provider-logo"
 import {
     AlertDialog,
     AlertDialogAction,
@@ -54,11 +54,7 @@ import { useDictionary } from "@/hooks/use-dictionary"
 import type { UseModelConfigReturn } from "@/hooks/use-model-config"
 import { formatMessage } from "@/lib/i18n/utils"
 import type { ProviderConfig, ProviderName } from "@/lib/types/model-config"
-import {
-    PROVIDER_INFO,
-    PROVIDER_LOGO_MAP,
-    SUGGESTED_MODELS,
-} from "@/lib/types/model-config"
+import { PROVIDER_INFO, SUGGESTED_MODELS } from "@/lib/types/model-config"
 import { cn } from "@/lib/utils"
 
 interface ModelConfigDialogProps {
@@ -69,38 +65,6 @@ interface ModelConfigDialogProps {
 
 type ValidationStatus = "idle" | "validating" | "success" | "error"
 
-// Provider logo component
-function ProviderLogo({
-    provider,
-    className,
-}: {
-    provider: ProviderName
-    className?: string
-}) {
-    // Use Lucide icons for providers without models.dev logos
-    if (provider === "bedrock") {
-        return <Cloud className={cn("size-4", className)} />
-    }
-    if (provider === "sglang") {
-        return <Server className={cn("size-4", className)} />
-    }
-    if (provider === "doubao") {
-        return <Sparkles className={cn("size-4", className)} />
-    }
-
-    const logoName = PROVIDER_LOGO_MAP[provider] || provider
-    return (
-        // biome-ignore lint/performance/noImgElement: External URL from models.dev
-        <img
-            alt={`${provider} logo`}
-            className={cn("size-4 dark:invert", className)}
-            height={16}
-            src={`https://models.dev/logos/${logoName}.svg`}
-            width={16}
-        />
-    )
-}
-
 // Configuration section with title and optional action
 function ConfigSection({
     title,
diff --git a/components/provider-logo.tsx b/components/provider-logo.tsx
new file mode 100644
index 0000000..0b04b0c
--- /dev/null
+++ b/components/provider-logo.tsx
@@ -0,0 +1,36 @@
+import { Cloud, Server, Sparkles } from "lucide-react"
+import { PROVIDER_LOGO_MAP, type ProviderName } from "@/lib/types/model-config"
+import { cn } from "@/lib/utils"
+
+// Provider logo from models.dev, with Lucide fallbacks for providers
+// that have no logo there
+export function ProviderLogo({
+    provider,
+    className,
+}: {
+    provider: ProviderName
+    className?: string
+}) {
+    if (provider === "bedrock") {
+        return <Cloud className={cn("size-4", className)} />
+    }
+    if (provider === "sglang") {
+        return <Server className={cn("size-4", className)} />
+    }
+    if (provider === "doubao") {
+        return <Sparkles className={cn("size-4", className)} />
+    }
+
+    const logoName = PROVIDER_LOGO_MAP[provider] || provider
+    return (
+        // biome-ignore lint/performance/noImgElement: External URL from models.dev
+        <img
+            alt=""
+            aria-hidden="true"
+            className={cn("size-4 dark:invert", className)}
+            height={16}
+            src={`https://models.dev/logos/${logoName}.svg`}
+            width={16}
+        />
+    )
+}
diff --git a/lib/admin/settings-registry.ts b/lib/admin/settings-registry.ts
index 59d127f..75ef165 100644
--- a/lib/admin/settings-registry.ts
+++ b/lib/admin/settings-registry.ts
@@ -76,6 +76,30 @@ export const SETTING_GROUPS: SettingGroup[] = [
     },
 ]
 
+// Provider name for each subgroup in the providers group (for logos)
+export const SUBGROUP_PROVIDERS: Record<string, string> = {
+    "AWS Bedrock": "bedrock",
+    OpenAI: "openai",
+    Anthropic: "anthropic",
+    Google: "google",
+    "Vertex AI": "vertexai",
+    "Azure OpenAI": "azure",
+    Ollama: "ollama",
+    OpenRouter: "openrouter",
+    DeepSeek: "deepseek",
+    SiliconFlow: "siliconflow",
+    SGLang: "sglang",
+    "Vercel AI Gateway": "gateway",
+    Doubao: "doubao",
+    ModelScope: "modelscope",
+    GLM: "glm",
+    Qwen: "qwen",
+    Kimi: "kimi",
+    Qiniu: "qiniu",
+    MiniMax: "minimax",
+    Novita: "novita",
+}
+
 const PROVIDER_OPTIONS = [
     "bedrock",
     "openai",