diff --git a/docs/apps/interactive-apps.mdx b/docs/apps/fastmcp-app.mdx
similarity index 100%
rename from docs/apps/interactive-apps.mdx
rename to docs/apps/fastmcp-app.mdx
diff --git a/docs/apps/overview.mdx b/docs/apps/overview.mdx
index ea4890bd7..ed04580f6 100644
--- a/docs/apps/overview.mdx
+++ b/docs/apps/overview.mdx
@@ -48,7 +48,7 @@ def team_directory() -> DataTable:
     return DataTable(columns=[...], rows=employees, search=True)
 ```
 
-### [FastMCPApp](/apps/interactive-apps) — when the UI calls back to the server
+### [FastMCPApp](/apps/fastmcp-app) — when the UI calls back to the server
 
 Forms that save data, buttons that trigger backend work, search that hits a database. `FastMCPApp` manages the wiring between UI actions and backend tools, with stable tool identifiers that survive server composition.
 
diff --git a/docs/apps/prefab.mdx b/docs/apps/prefab.mdx
index 00c4b4e84..1bebc73de 100644
--- a/docs/apps/prefab.mdx
+++ b/docs/apps/prefab.mdx
@@ -288,7 +288,7 @@ The user sees the chart. The model sees the summary.
 
 ## Next steps
 
-- **[FastMCPApp](/apps/interactive-apps)** — when your UI needs to call backend tools (forms, search, CRUD)
+- **[FastMCPApp](/apps/fastmcp-app)** — when your UI needs to call backend tools (forms, search, CRUD)
 - **[Generative UI](/apps/generative)** — let the LLM design the UI at runtime
 - **[Custom HTML](/apps/low-level)** — when Prefab isn't enough (maps, 3D, your own framework)
 - **[Examples](/apps/examples)** — complete working servers you can run today
diff --git a/docs/apps/quickstart.mdx b/docs/apps/quickstart.mdx
index e9c39ef21..7b87d1981 100644
--- a/docs/apps/quickstart.mdx
+++ b/docs/apps/quickstart.mdx
@@ -192,5 +192,5 @@ The `state={"selected": None}` dict on `PrefabApp` sets the initial value. Every
 You've built a tool that returns an interactive, reactive UI. This pattern covers a huge range of use cases: build a visualization, return it, and the user gets it rendered right in the conversation.
 
 - **[Interactive Tools](/apps/prefab)** — charts, tables, dashboards, reactive state, with live demos
-- **[FastMCPApp](/apps/interactive-apps)** — when the UI needs to call back to your server (forms, search, CRUD)
+- **[FastMCPApp](/apps/fastmcp-app)** — when the UI needs to call back to your server (forms, search, CRUD)
 - **[Examples](/apps/examples)** — complete working servers you can run today
diff --git a/docs/docs.json b/docs/docs.json
index 3dcbc1afc..86798bbcd 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -108,30 +108,22 @@
                   },
                   {
                     "collapsed": true,
-                    "group": "Features",
-                    "icon": "stars",
+                    "group": "Working with Tools",
+                    "icon": "wand-magic-sparkles",
                     "pages": [
-                      "servers/tasks",
-                      "servers/composition",
-                      "servers/dependency-injection",
-                      "servers/elicitation",
-                      "servers/icons",
-                      "servers/lifespan",
-                      "servers/logging",
-                      "servers/middleware",
-                      "servers/pagination",
-                      "servers/progress",
-                      "servers/sampling",
-                      "servers/storage-backends",
-                      "servers/telemetry",
-                      "servers/testing",
-                      "servers/versioning"
-                    ],
-                    "tag": "UPDATED"
+                      "servers/transforms/transforms",
+                      "servers/transforms/tool-transformation",
+                      "servers/transforms/code-mode",
+                      "servers/transforms/tool-search",
+                      "servers/transforms/namespace",
+                      "servers/visibility",
+                      "servers/transforms/resources-as-tools",
+                      "servers/transforms/prompts-as-tools"
+                    ]
                   },
                   {
                     "collapsed": true,
-                    "group": "Providers",
+                    "group": "MCP Providers",
                     "icon": "layer-group",
                     "pages": [
                       "servers/providers/overview",
@@ -139,22 +131,34 @@
                       "servers/providers/filesystem",
                       "servers/providers/proxy",
                       "servers/providers/skills",
+                      "servers/composition",
                       "servers/providers/custom"
                     ]
                   },
                   {
                     "collapsed": true,
-                    "group": "Transforms",
-                    "icon": "wand-magic-sparkles",
+                    "group": "Interactivity",
+                    "icon": "comments",
                     "pages": [
-                      "servers/transforms/transforms",
-                      "servers/transforms/namespace",
-                      "servers/transforms/tool-transformation",
-                      "servers/visibility",
-                      "servers/transforms/code-mode",
-                      "servers/transforms/tool-search",
-                      "servers/transforms/resources-as-tools",
-                      "servers/transforms/prompts-as-tools"
+                      "servers/elicitation",
+                      "servers/sampling",
+                      "servers/progress",
+                      "servers/logging",
+                      "servers/pagination",
+                      "servers/icons"
+                    ]
+                  },
+                  {
+                    "collapsed": true,
+                    "group": "Extensibility",
+                    "icon": "puzzle-piece",
+                    "pages": [
+                      "servers/middleware",
+                      "servers/dependency-injection",
+                      "servers/lifespan",
+                      "servers/storage-backends",
+                      "servers/tasks",
+                      "servers/versioning"
                     ]
                   },
                   {
@@ -187,7 +191,9 @@
                       "deployment/running-server",
                       "deployment/http",
                       "deployment/prefect-horizon",
-                      "deployment/server-configuration"
+                      "deployment/server-configuration",
+                      "servers/testing",
+                      "servers/telemetry"
                     ]
                   }
                 ]
@@ -197,27 +203,26 @@
                 "pages": [
                   "apps/overview",
                   "apps/quickstart",
+                  "apps/fastmcp-app",
                   "apps/prefab",
-                  "apps/interactive-apps",
                   "apps/generative",
                   "apps/low-level",
-                  {
-                    "collapsed": true,
-                    "group": "Providers",
-                    "icon": "layer-group",
-                    "pages": [
-                      "apps/providers/approval",
-                      "apps/providers/choice",
-                      "apps/providers/file-upload",
-                      "apps/providers/form"
-                    ],
-                    "tag": "NEW"
-                  },
                   {
                     "collapsed": true,
                     "group": "Reference",
                     "icon": "book",
                     "pages": [
+                      {
+                        "collapsed": true,
+                        "group": "Prefab Providers",
+                        "icon": "cube",
+                        "pages": [
+                          "apps/providers/approval",
+                          "apps/providers/choice",
+                          "apps/providers/file-upload",
+                          "apps/providers/form"
+                        ]
+                      },
                       "apps/development",
                       "apps/examples",
                       "apps/architecture"
@@ -232,26 +237,19 @@
                   "clients/transports",
                   {
                     "collapsed": true,
-                    "group": "Core Operations",
+                    "group": "Operations",
                     "icon": "toolbox",
                     "pages": [
                       "clients/tools",
                       "clients/resources",
-                      "clients/prompts"
-                    ]
-                  },
-                  {
-                    "collapsed": true,
-                    "group": "Handlers",
-                    "icon": "hand",
-                    "pages": [
-                      "clients/notifications",
+                      "clients/prompts",
                       "clients/sampling",
                       "clients/elicitation",
                       "clients/tasks",
                       "clients/progress",
                       "clients/logging",
-                      "clients/roots"
+                      "clients/roots",
+                      "clients/notifications"
                     ],
                     "tag": "UPDATED"
                   },
@@ -329,22 +327,24 @@
                   "integrations/mcp-json-configuration"
                 ]
               },
-              {
-                "group": "CLI",
-                "pages": [
-                  "cli/overview",
-                  "cli/running",
-                  "cli/install-mcp",
-                  "cli/inspecting",
-                  "cli/client",
-                  "cli/generate-cli",
-                  "cli/auth"
-                ]
-              },
               {
                 "group": "More",
                 "pages": [
                   "more/settings",
+                  {
+                    "collapsed": true,
+                    "group": "CLI",
+                    "icon": "terminal",
+                    "pages": [
+                      "cli/overview",
+                      "cli/running",
+                      "cli/install-mcp",
+                      "cli/inspecting",
+                      "cli/client",
+                      "cli/generate-cli",
+                      "cli/auth"
+                    ]
+                  },
                   {
                     "collapsed": true,
                     "group": "Upgrading",
@@ -402,6 +402,10 @@
     ]
   },
   "redirects": [
+    {
+      "destination": "/apps/fastmcp-app",
+      "source": "/apps/interactive-apps"
+    },
     {
       "destination": "/apps/generative",
       "source": "/apps/providers/generative"
diff --git a/docs/servers/transforms/namespace.mdx b/docs/servers/transforms/namespace.mdx
index 715bebd39..fdb0d1c7f 100644
--- a/docs/servers/transforms/namespace.mdx
+++ b/docs/servers/transforms/namespace.mdx
@@ -3,7 +3,6 @@ title: Namespace Transform
 sidebarTitle: Namespace
 description: Prefix component names to prevent conflicts
 icon: tag
-tag: NEW
 ---
 
 import { VersionBadge } from '/snippets/version-badge.mdx'
diff --git a/docs/servers/transforms/tool-transformation.mdx b/docs/servers/transforms/tool-transformation.mdx
index 393b47b5a..a50513f87 100644
--- a/docs/servers/transforms/tool-transformation.mdx
+++ b/docs/servers/transforms/tool-transformation.mdx
@@ -3,7 +3,6 @@ title: Tool Transformation
 sidebarTitle: Tool Transformation
 description: Modify tool schemas - rename, reshape arguments, and customize behavior
 icon: wrench
-tag: NEW
 ---
 
 import { VersionBadge } from '/snippets/version-badge.mdx'
diff --git a/docs/servers/transforms/transforms.mdx b/docs/servers/transforms/transforms.mdx
index 4008f86b4..4347b2f18 100644
--- a/docs/servers/transforms/transforms.mdx
+++ b/docs/servers/transforms/transforms.mdx
@@ -3,7 +3,6 @@ title: Transforms Overview
 sidebarTitle: Overview
 description: Modify components as they flow through your server
 icon: wand-magic-sparkles
-tag: NEW
 ---
 
 import { VersionBadge } from '/snippets/version-badge.mdx'