diff --git a/mkdocs.yml b/mkdocs.yml
index 5a96d9865c..228ed60edb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -393,56 +393,66 @@ nav:
               - "os/windows/group-policies.md"
   - !ENV [NAV_RECOMMENDATIONS, "Recommendations"]:
       - "tools.md"
-      - !ENV [NAV_INTERNET_BROWSING, "Internet Browsing"]:
-          - "tor.md"
+       - !ENV [NAV_AUTHENTICATION, "Authentication"]:
+          - "passwords.md"
+          - "multi-factor-authentication.md"
+          - "security-keys.md"
+        - !ENV [NAV_COMMUNICATION, "Communication"]:
+          - "email-services.md"
+          - "email-clients.md"
+          - "email-aliases.md"
+          - "real-time-communication.md" # TEMP
+        - !ENV [NAV_INTERNET_BROWSING, "Internet Browsing"]:
           - "desktop-browsers.md"
           - "mobile-browsers.md"
+          - "tor.md"
+          - "search-engines.md"
           - "browser-extensions.md"
-      - !ENV [NAV_PROVIDERS, "Providers"]:
-          - "cloud.md"
-          - "data-broker-removals.md"
+        - !ENV [NAV_NETWORKING, "Networking"]:
+          - "vpn-services.md"
+          # - "firewalls.md"
           - "dns.md"
-          - "email-aliasing.md"
-          - "email.md"
-          - "financial-services.md"
-          - "photo-management.md"
-          - "search-engines.md"
-          - "vpn.md"
-      - !ENV [NAV_SOFTWARE, "Software"]:
-          - "ai-chat.md"
-          - "calendar.md"
-          - "cryptocurrency.md"
-          - "data-redaction.md"
+          - "router.md"
+          - "alternative-networks.md"
+         - !ENV [NAV_FILES, "Files"]:
+          - "cloud-storage.md"
           - "document-collaboration.md"
-          - "email-clients.md"
           - "encryption.md"
+          - "data-redaction.md"
+          - "photo-management.md"
           - "file-sharing.md"
-          - "frontends.md"
-          - "health-and-wellness.md"
+          - "pastebins.md"
+        - !ENV [NAV_PRODUCTIVITY, "Productivity"]:
+          - "calendar.md"
+          - "notebooks.md"
           - "language-tools.md"
+          - "ai-chat.md"
+        - !ENV [NAV_HEALTH_WELLNESS, "Health and Wellness"]:
+          #- "menstruation-trackers.md"
+          #- "sport-and-fitness.md"
+          #- "health-records.md"
+          - "health-and-wellness.md" #TEMP
+        - !ENV [NAV_TRAVEL, "Travel"]:
           - "maps.md"
-          - "multi-factor-authentication.md"
-          - "news-aggregators.md"
-          - "notebooks.md"
-          - "office-suites.md"
-          - "passwords.md"
-          - "pastebins.md"
-          - "real-time-communication.md"
+        - !ENV [NAV_MEDIA, "Media"]:
           - "social-networks.md"
-      - !ENV [NAV_HARDWARE, "Hardware"]:
+          - "frontends.md"
+          - "news-aggregators.md"
+         - !ENV [NAV_FINANCIAL, "Financial Transactions"]:
+          - "financial-services.md"
+          - "cryptocurrency.md"
+      - !ENV [NAV_DEVICES, "Devices"]:
+          - "laptop-desktop.md"
           - "mobile-phones.md"
-          - "security-keys.md"
+          # - "smartwatches.md"
+          - "device-integrity.md"
       - !ENV [NAV_OPERATING_SYSTEMS, "Operating Systems"]:
           - !ENV [NAV_ANDROID, "Android"]:
-              - "android/index.md"
-              - "android/distributions.md"
-              - "android/general-apps.md"
-              - "android/obtaining-apps.md"
+            - "android/index.md"
+            - "android/distributions.md"
+            - "android/general-apps.md"
+            - "android/obtaining-apps.md"
           - "desktop.md"
-          - "router.md"
-      - !ENV [NAV_ADVANCED, "Advanced"]:
-          - "alternative-networks.md"
-          - "device-integrity.md"
   - !ENV [NAV_BLOG, "Articles"]: "/articles/"
   - !ENV [NAV_VIDEOS, "Videos"]: /videos/
   - !ENV [NAV_FORUM, "Forum"]: