diff --git a/mkdocs.yml b/mkdocs.yml
index c2d89224..967061e5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -16,43 +16,45 @@ exclude_docs: |
 nav:
   - About: index.md
   - Introduction: introduction.md
-  - Network Configuration: networking.md
-  - System Configuration: system.md
-  - System Management: management.md
-  - System Upgrade: upgrade.md
   - CLI:
-      - Introduction : cli/introduction.md
+      - Introduction: cli/introduction.md
       - Configuration: cli/configure.md
       - Keybindings: cli/keybindings.md
       - Network Calculator: cli/netcalc.md
       - Network Monitoring: cli/tcpdump.md
       - Quickstart Guide:  cli/quick.md
-      - Text Edítor: cli/text-editor.md
+      - Text Editor: cli/text-editor.md
       - Upgrading: cli/upgrade.md
-  - In-Depth:
-      - Boot Procedure: boot.md
-      - DHCP Server: dhcp.md
-      - Docker Containers: container.md
-      - Hardware Info & Status: hardware.md
-      - Network Discovery: discovery.md
-      - Scripting Infix:
-          - Introduction: scripting.md
-          - Advanced Usage: scripting-sysrepocfg.md
-          - Remote RESTCONF: scripting-restconf.md
-          - Production Testing: scripting-prod.md
-      - Tunneling (L2/L3): tunnels.md
+  - Docker Containers: container.md
+  - Networking:
+      - Network Configuration: networking.md
       - Quality of Service: qos.md
       - RMON Counters: eth-counters.md
-      - Syslog Support: syslog.md
-      - Virtual Environments: virtual.md
+      - Tunneling (L2/L3): tunnels.md
       - Wireless LAN (WiFi): wifi.md
-  - For Developers:
+  - Services:
+      - Device Discovery: discovery.md
+      - DHCP Server: dhcp.md
+  - System:
+      - Boot Procedure: boot.md
+      - Configuration: system.md
+      - Hardware Info & Status: hardware.md
+      - Management: management.md
+      - Syslog Support: syslog.md
+      - Upgrade: upgrade.md
+  - Scripting:
+      - Introduction: scripting.md
+      - Legacy Scripting: scripting-sysrepocfg.md
+      - Production Testing: scripting-prod.md
+      - Remote RESTCONF: scripting-restconf.md
+  - Developer's Corner:
       - Branding & Releases: branding.md
       - Developer's Guide: developers-guide.md
       - Developing with Buildroot: override-package.md
       - Netboot HowTo: netboot.md
       - Regression Testing: testing.md
-      - Test System Architechture: test-arch.md
+      - Test System Architecture: test-arch.md
+      - Virtual Environments: virtual.md
       - Vital Product Data (VPD): vpd.md
   - Origin & Licensing: license.md
 
@@ -63,10 +65,10 @@ theme:
     - toc.follow
 #    - toc.integrate
     - navigation.path
-#    - navigation.prune
     - navigation.instant
-#    - navigation.instant.progress
+    - navigation.instant.progress
     - navigation.tracking
+    - navigation.indexes
 #    - navigation.tabs
 #    - navigation.sections
 #    - navigation.expand