diff --git a/doc.zih.tu-dresden.de/docs/software/performance_engineering_overview.md b/doc.zih.tu-dresden.de/docs/software/performance_engineering_overview.md
index d58b5e1b4acaea84ec4c0f87420859422aa5b2d1..564db230ca699fbc309a1e50b1ffb6d361e28828 100644
--- a/doc.zih.tu-dresden.de/docs/software/performance_engineering_overview.md
+++ b/doc.zih.tu-dresden.de/docs/software/performance_engineering_overview.md
@@ -38,8 +38,8 @@ software performance engineering or application performance engineering within s
 | [PAPI](#papi)        | Read portable CPU counters                   | advanced    | medium   | variable  | yes            |
 | [Perf](#perf-tools)  | Produce and visualize [profile](#profile)    | easy        | medium   | low       | (no)[^2]       |
 | [PIKA](#pika)        | Show performance [profile](#profile) and [trace](#trace) | very easy | low | very low | no         |
-| [Slurm](#slurm-profiler) | Produce and visualize simple [trace](#trace)| easy     | low      | low       | no             |
 | [Score-P](#score-p)  | Create performance [trace](#trace)           | complex     | high     | variable  | yes            |
+| [Slurm](#slurm-profiler) | Produce and visualize simple [trace](#trace)| easy     | low      | low       | no             |
 | [Vampir](#vampir)    | Visualize performance [trace](#trace)        | complex     | high     | n.a.      | n.a.           |
 
 [^2]: Re-compilation is not required. Yet, to obtain more details it is recommended to re-compile with the `-g` compiler option, which adds debugging information to the executable of an application.
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 674174a36a90f0f48d81d04aadd36574b9c0afb3..263e81f662b0f6b7aa737c8a5b5903ec90340203 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -81,16 +81,17 @@ nav:
       - GPU Programming: software/gpu_programming.md
       - Mathematics Libraries: software/math_libraries.md
       - Debugging: software/debuggers.md
-    - Software Engineering Tools:
+    - Performance Engineering Tools:
       - Overview: software/performance_engineering_overview.md
-      - MPI Error Detection: software/mpi_usage_error_detection.md
-      - Score-P: software/scorep.md
-      - lo2s: software/lo2s.md
-      - PAPI Library: software/papi.md
-      - PIKA: software/pika.md
-      - Perf Tools: software/perf_tools.md
-      - Vampir: software/vampir.md
-      - Energy Measurement: software/energy_measurement.md
+      - Record Course of Events with lo2s: software/lo2s.md
+      - Check MPI Correctness with MUST: software/mpi_usage_error_detection.md
+      - Read CPU Performance Counters with PAPI: software/papi.md
+      - Produce Performance Overview with Perf: software/perf_tools.md
+      - Track Slurm Jobs with PIKA: software/pika.md
+      - Record Course of Events with Score-P: software/scorep.md
+      - Profile Jobs with Slurm: jobs_and_resources/slurm_profiling.md
+      - Study Course of Events with Vampir: software/vampir.md
+      - Measure Energy Consumption: software/energy_measurement.md
     - Utilities: software/utilities.md
   - HPC Resources and Jobs:
     - Overview: jobs_and_resources/overview.md