diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 528d8d829..247b02054 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -89,7 +89,7 @@ plugins:
                 - "!^_"
 
 nav:
-  - Get started:
+  - Guides:
     - index.md
     - Quickstarts:
       - Agent: agents/agents.md
@@ -114,15 +114,23 @@ nav:
         - Runtime: concepts/pregel.md
         - Functional API: concepts/functional_api.md
     - Core capabilities:
-      - Streaming: concepts/streaming.md
+      - Streaming:
+        - Overview: concepts/streaming.md
+        - Stream outputs: how-tos/streaming.md
       - Persistence: concepts/persistence.md
       - Durable execution: concepts/durable_execution.md
       - Memory: concepts/memory.md
-      - Tools: concepts/tools.md
+      - Tools:
+        - Overview: concepts/tools.md
+        - Call tools: how-tos/tool-calling.md
       - Human-in-the-loop: concepts/human_in_the_loop.md
       - Breakpoints: concepts/breakpoints.md
-      - Time travel: concepts/time-travel.md
+      - Time travel:
+        - Overview: concepts/time-travel.md
+        - Use time-travel: how-tos/human_in_the_loop/time-travel.md
       - Multi-agent: concepts/multi_agent.md
+      - MCP:
+          - Use MCP: agents/mcp.md
     - Platform capabilities:
       - LangGraph Platform:
           - Overview: concepts/langgraph_platform.md
@@ -150,29 +158,28 @@ nav:
           - Self-Hosted Data Plane: concepts/langgraph_self_hosted_data_plane.md
           - Self-Hosted Control Plane: concepts/langgraph_self_hosted_control_plane.md
           - Standalone Container: concepts/langgraph_standalone_container.md
-    
+      - Use the API:
+        - Use RemoteGraph: how-tos/use-remote-graph.md
+        - Human in the loop: cloud/how-tos/add-human-in-the-loop.md
+        - Breakpoints: cloud/how-tos/human_in_the_loop_breakpoint.md
+        - Timetravel: cloud/how-tos/human_in_the_loop_time_travel.md
+        - Streaming: cloud/how-tos/streaming.md
+        - MCP: concepts/server-mcp.md
+
   - Guides:
     - LangGraph APIs:
       - Use the Graph API: how-tos/graph-api.ipynb
       - Use the Functional API: how-tos/use-functional-api.md
     - Models:
       - Configure model: agents/models.md
-    - Streaming:
-      - Stream outputs: how-tos/streaming.md
-      - Use Server API: cloud/how-tos/streaming.md
     - Context:
       - Add context: agents/context.md
     - Memory:
       - Add memory: how-tos/memory/add-memory.md
     - Human-in-the-loop:
       - how-tos/human_in_the_loop/add-human-in-the-loop.md
-      - Use Server API: cloud/how-tos/add-human-in-the-loop.md
-    - Time travel:
-      - how-tos/human_in_the_loop/time-travel.md
-      - Use Server API: cloud/how-tos/human_in_the_loop_time_travel.md
     - Breakpoints:
       - Set breakpoints: how-tos/human_in_the_loop/breakpoints.md
-      - Use Server API: cloud/how-tos/human_in_the_loop_breakpoint.md
     - Tools:
       - Call tools: how-tos/tool-calling.md
     - Subgraphs:
@@ -180,9 +187,6 @@ nav:
     - Multi-agent:
       - Prebuilt implementation: agents/multi-agent.md
       - Custom implementation: how-tos/multi_agent.ipynb
-    - MCP:
-      - Use MCP: agents/mcp.md
-      - Server API: concepts/server-mcp.md
     - Evaluation:
         - Basic implementation: agents/evals.md
     - Deployment:
@@ -192,7 +196,7 @@ nav:
         - Use pyproject.toml: cloud/deployment/setup_pyproject.md
         - Use JavaScript: cloud/deployment/setup_javascript.md
         - Use custom Docker: cloud/deployment/custom_docker.md
-        - Rebuild graph at runtime: cloud/deployment/graph_rebuild.md
+        - Rebuild graph at rutime: cloud/deployment/graph_rebuild.md
       - Deploy to production:
          - Cloud SaaS: cloud/deployment/cloud.md
          - Self-Hosted Data Plane: cloud/deployment/self_hosted_data_plane.md
@@ -275,7 +279,6 @@ nav:
         - tutorials/auth/getting_started.md
         - tutorials/auth/resource_auth.md
         - tutorials/auth/add_auth_server.md
-      - Use RemoteGraph: how-tos/use-remote-graph.md
       - Deploy CrewAI, AutoGen, and other frameworks: how-tos/autogen-langgraph-platform.ipynb
         # combine with how-tos/autogen-integration.ipynb
       - Front-end and generative UI: