diff --git a/doc.zih.tu-dresden.de/docs/software/software_development_overview.md b/doc.zih.tu-dresden.de/docs/software/software_development_overview.md
index 8657e9893a3ac4c4e4c90e6023d3b32cc838feac..4cdbb991d8bdf0eb81166239ebc601fbf40ea58c 100644
--- a/doc.zih.tu-dresden.de/docs/software/software_development_overview.md
+++ b/doc.zih.tu-dresden.de/docs/software/software_development_overview.md
@@ -14,14 +14,14 @@ It will tell you:
     - [Find caveats and hidden errors in MPI application codes](mpi_usage_error_detection.md)
     - [Debuggers](debuggers.md)
 - How to investigate the performance and efficiency of your code
-    - [Monitor batch jobs with Pika](pika.md)
-    - [Sampling-based performance analysis with Perf](perf_tools.md)
-    - [Event tracing for HPC applications with Score-P](scorep.md)
-    - [Trace visualization with Vampir](vampir.md)
+    - [Pika: monitoring of batch jobs](pika.md)
+    - [Perf: sampling-based performance analysis](perf_tools.md)
+    - [Score-P: event tracing of HPC applications](scorep.md)
+    - [Vampir: trace visualization](vampir.md)
 
 Some hints that are helpful:
 
-- Stick to standards wherever possible, e.g. use the **`-std`** flag
+- Stick to standards wherever possible, e.g. use the `-std` flag
   for GNU and Intel C/C++ compilers. Computers are short living
   creatures, migrating between platforms can be painful. In addition,
   running your code on different platforms greatly increases the
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index 4f6fcfc3d2eb5fb288a30837b10813e2ba9a16d3..94183f4692e268cf1e4e61b339b4f095a48a5eda 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -60,15 +60,14 @@ nav:
     - Software Development and Tools:
       - Overview: software/software_development_overview.md
       - Building Software: software/building_software.md
-      - GPU Programming: software/gpu_programming.md
       - Compilers: software/compilers.md
-      - Debugging:
-        - Overview: software/debuggers.md
-        - MPI Error Detection: software/mpi_usage_error_detection.md
+      - GPU Programming: software/gpu_programming.md
       - Libraries: software/libraries.md
-      - Score-P: software/scorep.md
+      - Debugging: software/debuggers.md
+      - MPI Error Detection: software/mpi_usage_error_detection.md
+      - Pika: software/pika.md
       - Perf Tools: software/perf_tools.md 
-      - PIKA: software/pika.md
+      - Score-P: software/scorep.md
       - Vampir: software/vampir.md
   - Data Life Cycle Management:
     - Overview: data_lifecycle/overview.md