diff --git a/mkdocs.yml b/mkdocs.yml
index f2555bc329d76ac7e60ae7ed3f78fa080a93c806..61a0041358a65c8a1caf190b5438024b0931960a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -66,17 +66,64 @@ nav:
         - athena/configuration/tutorial/fragments.md
         - athena/configuration/tutorial/tools.md
         - athena/configuration/tutorial/steering.md
-    - Athena developers:
+    - Containers and VMs:
+      - athena/containers/index.md
+      - athena/containers/intro-docker.md
+      - athena/containers/mac-setup.md
+      - athena/containers/ubuntu-setup.md
+      - athena/containers/dev-setup.md
+      - athena/containers/lima.md
+    - Performance and Monitoring:
+      - athena/performance/index.md
+      - Monitoring:
+        - athena/performance/perfmonmt.md
+        - athena/performance/prmon.md
+      - Performance:
+        - athena/performance/valgrind.md
+        - athena/performance/valgrind-examples.md
+        - athena/performance/heaptrack.md
+        - athena/performance/callgrind.md
+        - athena/performance/vtune.md
+    - athena/gpu/index.md
+    - athena/io/index.md
+  - Developers:
       - athena/developers/index.md
       - athena/developers/releases.md
+      - Git Workflow:
+        - athena/git/index.md
+        - athena/git/workflow-quick.md
+        - athena/git/continuous-integration.md
+        - athena/git/resolve-conflict.md
+        - athena/git/git-atlas.md
+        - athena/git/tips.md
+        - Git Tutorial:
+          - athena/git/env-setup.md
+          - athena/git/gitlab-fork.md
+          - athena/git/clone.md
+          - athena/git/branch.md
+          - athena/git/develop.md
+          - athena/git/commit.md
+          - athena/git/merge-request.md
+        - Archived:
+          - athena/git/pseudomerge.md
+          - athena/git/svn-migrate.md
+      - IDE Integration & VSCode:
+        - athena/ide/index.md
+        - IDE Integrations:
+          - athena/ide/setup.md
+          - athena/ide/cpp.md
+          - athena/ide/python.md
+        - VS Code Usage Patterns:
+          - athena/ide/native.md
+          - athena/ide/ssh.md
+          - athena/ide/docker.md
       - athena/developers/cmake.md
       - athena/developers/building.md
       - athena/developers/building-externals.md
       - athena/developers/calib.md
       - athena/developers/issue-reporting.md
-      - athena/git/develop.md
       - coding-guidelines/index.md
-      - Developer tutorial:
+      - Developer Tutorial:
         - athena/developers/tutorial/index.md
         - athena/developers/tutorial/prerequisites.md
         - athena/developers/tutorial/gaudiathena-intro.md
@@ -85,58 +132,11 @@ nav:
         - athena/developers/tutorial/vscode.md
         - athena/developers/tutorial/cpp.md
         - athena/developers/tutorial/writing-algstools.md
+        - athena/developers/tutorial/persistency.md
         - athena/developers/tutorial/cmake.md
         - athena/developers/tutorial/testing_debugging.md
         - athena/developers/tutorial/conditions.md
         - athena/developers/tutorial/performance.md
-        - athena/developers/tutorial/persistency.md
-    - Git Workflow:
-      - athena/git/index.md
-      - athena/git/workflow-quick.md
-      - athena/git/continuous-integration.md
-      - athena/git/resolve-conflict.md
-      - athena/git/git-atlas.md
-      - athena/git/tips.md
-      - Git Tutorial:
-        - athena/git/env-setup.md
-        - athena/git/gitlab-fork.md
-        - athena/git/clone.md
-        - athena/git/branch.md
-        - athena/git/commit.md
-        - athena/git/merge-request.md
-      - Archived:
-          - athena/git/pseudomerge.md
-          - athena/git/svn-migrate.md
-    - IDE integration & VSCode:
-      - athena/ide/index.md
-      - IDE Integrations:
-        - athena/ide/setup.md
-        - athena/ide/cpp.md
-        - athena/ide/python.md
-      - VS Code Usage Patterns:
-        - athena/ide/native.md
-        - athena/ide/ssh.md
-        - athena/ide/docker.md
-    - Containers and VMs:
-      - athena/containers/index.md
-      - athena/containers/intro-docker.md
-      - athena/containers/mac-setup.md
-      - athena/containers/ubuntu-setup.md
-      - athena/containers/dev-setup.md
-      - athena/containers/lima.md
-    - Performance and monitoring:
-      - athena/performance/index.md
-      - Monitoring:
-        - athena/performance/perfmonmt.md
-        - athena/performance/prmon.md
-      - Performance:
-        - athena/performance/valgrind.md
-        - athena/performance/valgrind-examples.md
-        - athena/performance/heaptrack.md
-        - athena/performance/callgrind.md
-        - athena/performance/vtune.md
-    - athena/gpu/index.md
-    - athena/io/index.md
   - Trigger:
     - Trigger Developers Guide:
       - athena/trigger/index.md
@@ -165,7 +165,7 @@ nav:
       - athena/trigger/menumonitoring.md
       - athena/trigger/menutriggerapi.md
       - athena/trigger/triggerdb.md
-  - Software infrastructure:
+  - Shifts and Infrastructure:
     - software-infrastructure/index.md
     - software-infrastructure/code-review/index.md
     - Merge Review Shifts Tutorial: