diff --git a/mkdocs.yml b/mkdocs.yml
index 3a8de784aabc74b9c13c08bf9dfeb270b6e18ccf..1822ba11d9ba407c3ff751e80bd4dfc0b1206c78 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -37,8 +37,8 @@ pages:
     - Job Submission and Execution: anselm-cluster-documentation/job-submission-and-execution.md
     - Capacity computing: anselm-cluster-documentation/capacity-computing.md
     - Storage: anselm-cluster-documentation/storage.md
-  - Anselm Cluster Software: anselm-cluster-documentation/software/index.md
-  - ' Anselm Cluster Software':
+#  - Anselm Cluster Software: anselm-cluster-documentation/software/index.md
+  - 'Anselm Cluster Software':
     - Modules: modules-anselm.md
     - COMSOL: anselm-cluster-documentation/software/comsol-multiphysics.md
     - ParaView: anselm-cluster-documentation/software/paraview.md
@@ -51,59 +51,59 @@ pages:
     - Virtualization: anselm-cluster-documentation/software/kvirtualization.md
     - Java: anselm-cluster-documentation/software/java.md
     - Operating System: anselm-cluster-documentation/software/operating-system.md
-  - ' Anselm Cluster Intel Suite':
-    - Introduction: anselm-cluster-documentation/software/intel-suite/introduction.md
-    - Intel MKL: anselm-cluster-documentation/software/intel-suite/intel-mkl.md
-    - Intel Compilers: anselm-cluster-documentation/software/intel-suite/intel-compilers.md
-    - Intel IPP: anselm-cluster-documentation/software/intel-suite/intel-integrated-performance-primitives.md
-    - Intel TBB: anselm-cluster-documentation/software/intel-suite/intel-tbb.md
-    - Intel Debugger: anselm-cluster-documentation/software/intel-suite/intel-debugger.md
-  - ' Anselm Cluster MPI':
-    - Introduction: anselm-cluster-documentation/software/mpi/mpi.md
-    - MPI4Py (MPI for Python): anselm-cluster-documentation/software/mpi/mpi4py-mpi-for-python.md
-    - Running OpenMPI: anselm-cluster-documentation/software/mpi/Running_OpenMPI.md
-    - Running MPICH2: anselm-cluster-documentation/software/mpi/running-mpich2.md
-  - ' Anselm Cluster Numerical Libraries':
-    - Intel numerical libraries: anselm-cluster-documentation/software/numerical-libraries/intel-numerical-libraries.md
-    - PETSc: anselm-cluster-documentation/software/numerical-libraries/petsc.md
-    - Trilinos: anselm-cluster-documentation/software/numerical-libraries/trilinos.md
-    - FFTW: anselm-cluster-documentation/software/numerical-libraries/fftw.md
-    - GSL: anselm-cluster-documentation/software/numerical-libraries/gsl.md
-    - MAGMA for Intel Xeon Phi: anselm-cluster-documentation/software/numerical-libraries/magma-for-intel-xeon-phi.md
-    - HDF5: anselm-cluster-documentation/software/numerical-libraries/hdf5.md
-  - ' Anselm Cluster Omics Master':
-    - Diagnostic component (TEAM): anselm-cluster-documentation/software/omics-master/diagnostic-component-team.md
-    - Priorization component (BiERApp): anselm-cluster-documentation/software/omics-master/priorization-component-bierapp.md
-    - Overview: anselm-cluster-documentation/software/omics-master/overview.md
-  - ' Anselm Cluster Debuggers':
-    - Valgrind: anselm-cluster-documentation/software/debuggers/valgrind.md
-    - PAPI: anselm-cluster-documentation/software/debuggers/papi.md
-    - Allinea Forge (DDT,MAP): anselm-cluster-documentation/software/debuggers/allinea-ddt.md
-    - Total View: anselm-cluster-documentation/software/debuggers/total-view.md
-    - CUBE: anselm-cluster-documentation/software/debuggers/cube.md
-    - Intel VTune Amplifier: anselm-cluster-documentation/software/debuggers/intel-vtune-amplifier.md
-    - VNC: anselm-cluster-documentation/software/debuggers/debuggers.md
-    - Scalasca: anselm-cluster-documentation/software/debuggers/scalasca.md
-    - Score-P: anselm-cluster-documentation/software/debuggers/score-p.md
-    - Intel Performance Counter Monitor: anselm-cluster-documentation/software/debuggers/intel-performance-counter-monitor.md
-    - Allinea Performance Reports: anselm-cluster-documentation/software/debuggers/allinea-performance-reports.md
-    - Vampir: anselm-cluster-documentation/software/debuggers/vampir.md
-  - ' Anselm Cluster Numerical Languages':
-    - Introduction: anselm-cluster-documentation/software/numerical-languages/introduction.md
-    - R: anselm-cluster-documentation/software/numerical-languages/r.md
-    - Matlab 2013-2014: anselm-cluster-documentation/software/numerical-languages/matlab_1314.md
-    - Matlab: anselm-cluster-documentation/software/numerical-languages/matlab.md
-    - Octave: anselm-cluster-documentation/software/numerical-languages/octave.md
-  - ' Anselm Cluster Chemistry':
-    - Molpro: anselm-cluster-documentation/software/chemistry/molpro.md
-    - NWChem: anselm-cluster-documentation/software/chemistry/nwchem.md
-  - ' Anselm Cluster Ansys':
-    - Introduction: anselm-cluster-documentation/software/ansys/ansys.md
-    - ANSYS CFX: anselm-cluster-documentation/software/ansys/ansys-cfx.md
-    - ANSYS LS-DYNA: anselm-cluster-documentation/software/ansys/ansys-ls-dyna.md
-    - ANSYS MAPDL: anselm-cluster-documentation/software/ansys/ansys-mechanical-apdl.md
-    - LS-DYNA: anselm-cluster-documentation/software/ansys/ls-dyna.md
-    - ANSYS Fluent: anselm-cluster-documentation/software/ansys/ansys-fluent.md
+    - 'Intel Suite':
+      - Introduction: anselm-cluster-documentation/software/intel-suite/introduction.md
+      - Intel MKL: anselm-cluster-documentation/software/intel-suite/intel-mkl.md
+      - Intel Compilers: anselm-cluster-documentation/software/intel-suite/intel-compilers.md
+      - Intel IPP: anselm-cluster-documentation/software/intel-suite/intel-integrated-performance-primitives.md
+      - Intel TBB: anselm-cluster-documentation/software/intel-suite/intel-tbb.md
+      - Intel Debugger: anselm-cluster-documentation/software/intel-suite/intel-debugger.md
+    - 'MPI':
+      - Introduction: anselm-cluster-documentation/software/mpi/mpi.md
+      - MPI4Py (MPI for Python): anselm-cluster-documentation/software/mpi/mpi4py-mpi-for-python.md
+      - Running OpenMPI: anselm-cluster-documentation/software/mpi/Running_OpenMPI.md
+      - Running MPICH2: anselm-cluster-documentation/software/mpi/running-mpich2.md
+    - 'Numerical Libraries':
+      - Intel numerical libraries: anselm-cluster-documentation/software/numerical-libraries/intel-numerical-libraries.md
+      - PETSc: anselm-cluster-documentation/software/numerical-libraries/petsc.md
+      - Trilinos: anselm-cluster-documentation/software/numerical-libraries/trilinos.md
+      - FFTW: anselm-cluster-documentation/software/numerical-libraries/fftw.md
+      - GSL: anselm-cluster-documentation/software/numerical-libraries/gsl.md
+      - MAGMA for Intel Xeon Phi: anselm-cluster-documentation/software/numerical-libraries/magma-for-intel-xeon-phi.md
+      - HDF5: anselm-cluster-documentation/software/numerical-libraries/hdf5.md
+    - 'Omics Master':
+      - Diagnostic component (TEAM): anselm-cluster-documentation/software/omics-master/diagnostic-component-team.md
+      - Priorization component (BiERApp): anselm-cluster-documentation/software/omics-master/priorization-component-bierapp.md
+      - Overview: anselm-cluster-documentation/software/omics-master/overview.md
+    - 'Debuggers':
+      - Valgrind: anselm-cluster-documentation/software/debuggers/valgrind.md
+      - PAPI: anselm-cluster-documentation/software/debuggers/papi.md
+      - Allinea Forge (DDT,MAP): anselm-cluster-documentation/software/debuggers/allinea-ddt.md
+      - Total View: anselm-cluster-documentation/software/debuggers/total-view.md
+      - CUBE: anselm-cluster-documentation/software/debuggers/cube.md
+      - Intel VTune Amplifier: anselm-cluster-documentation/software/debuggers/intel-vtune-amplifier.md
+      - VNC: anselm-cluster-documentation/software/debuggers/debuggers.md
+      - Scalasca: anselm-cluster-documentation/software/debuggers/scalasca.md
+      - Score-P: anselm-cluster-documentation/software/debuggers/score-p.md
+      - Intel Performance Counter Monitor: anselm-cluster-documentation/software/debuggers/intel-performance-counter-monitor.md
+      - Allinea Performance Reports: anselm-cluster-documentation/software/debuggers/allinea-performance-reports.md
+      - Vampir: anselm-cluster-documentation/software/debuggers/vampir.md
+    - 'Numerical Languages':
+      - Introduction: anselm-cluster-documentation/software/numerical-languages/introduction.md
+      - R: anselm-cluster-documentation/software/numerical-languages/r.md
+      - Matlab 2013-2014: anselm-cluster-documentation/software/numerical-languages/matlab_1314.md
+      - Matlab: anselm-cluster-documentation/software/numerical-languages/matlab.md
+      - Octave: anselm-cluster-documentation/software/numerical-languages/octave.md
+    - 'Chemistry':
+      - Molpro: anselm-cluster-documentation/software/chemistry/molpro.md
+      - NWChem: anselm-cluster-documentation/software/chemistry/nwchem.md
+    - 'Ansys':
+      - Introduction: anselm-cluster-documentation/software/ansys/ansys.md
+      - ANSYS CFX: anselm-cluster-documentation/software/ansys/ansys-cfx.md
+      - ANSYS LS-DYNA: anselm-cluster-documentation/software/ansys/ansys-ls-dyna.md
+      - ANSYS MAPDL: anselm-cluster-documentation/software/ansys/ansys-mechanical-apdl.md
+      - LS-DYNA: anselm-cluster-documentation/software/ansys/ls-dyna.md
+      - ANSYS Fluent: anselm-cluster-documentation/software/ansys/ansys-fluent.md
   - Salomon Cluster Documentation:
     - Introduction: salomon/introduction.md
     - PRACE User Support: salomon/prace.md
@@ -122,58 +122,57 @@ pages:
     - Job submission and execution: salomon/job-submission-and-execution.md
     - Capacity computing: salomon/capacity-computing.md
     - Storage: salomon/storage.md
-  - Salomon Cluster Software: salomon/software/index.md
-  - ' Salomon Cluster Software':
+  - 'Salomon Cluster Software':
     - Modules: modules-salomon.md
     - UV Modules: modules-salomon-uv.md
     - Compilers: salomon/software/compilers.md
     - Intel Xeon Phi: salomon/software/intel-xeon-phi.md
     - Java: salomon/software/java.md
     - Operating System: salomon/software/operating-system.md
-  - ' Salomon Cluster Intel Suite':
-    - Introduction: salomon/software/intel-suite/intel-parallel-studio-introduction.md
-    - Intel MKL: salomon/software/intel-suite/intel-mkl.md
-    - Intel Compilers: salomon/software/intel-suite/intel-compilers.md
-    - Intel IPP: salomon/software/intel-suite/intel-integrated-performance-primitives.md
-    - Intel TBB: salomon/software/intel-suite/intel-tbb.md
-    - Intel Debugger: salomon/software/intel-suite/intel-debugger.md
-    - Intel Inspector: salomon/software/intel-suite/intel-inspector.md
-    - Intel Trace Analyzer and Collector: salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
-    - Intel Advisor: salomon/software/intel-suite/intel-advisor.md
-  - ' Salomon Cluster MPI':
-    - Introduction: salomon/software/mpi/mpi.md
-    - MPI4Py (MPI for Python): salomon/software/mpi/mpi4py-mpi-for-python.md
-    - Running OpenMPI: salomon/software/mpi/Running_OpenMPI.md
-  - ' Salomon Cluster Debuggers':
-    - Introduction: salomon/software/debuggers/Introduction.md
-    - Valgrind: salomon/software/debuggers/valgrind.md
-    - Allinea Forge (DDT,MAP): salomon/software/debuggers/allinea-ddt.md
-    - Total View: salomon/software/debuggers/total-view.md
-    - Intel VTune Amplifier XE: salomon/software/debuggers/intel-vtune-amplifier.md
-    - Aislinn: salomon/software/debuggers/aislinn.md
-    - Allinea Performance Reports: salomon/software/debuggers/allinea-performance-reports.md
-    - Vampir: salomon/software/debuggers/vampir.md
-  - ' Salomon Cluster Numerical Languages':
-    - Introduction: salomon/software/numerical-languages/introduction.md
-    - R: salomon/software/numerical-languages/r.md
-    - Matlab: salomon/software/numerical-languages/matlab.md
-    - Octave: salomon/software/numerical-languages/octave.md
-  - ' Salomon Cluster Chemistry':
-    - Molpro: salomon/software/chemistry/molpro.md
-    - Phono3py: salomon/software/chemistry/phono3py.md
-    - NWChem: salomon/software/chemistry/nwchem.md
-  - ' Salomon Cluster Comsol':
-    - COMSOL: salomon/software/comsol/comsol-multiphysics.md
-    - Licensing and Available Versions: salomon/software/comsol/licensing-and-available-versions.md
-  - ' Salomon Cluster Ansys':
-    - Introduction: salomon/software/ansys/ansys.md
-    - Workbench: salomon/software/ansys/workbench.md
-    - ANSYS CFX: salomon/software/ansys/ansys-cfx.md
-    - ANSYS LS-DYNA: salomon/software/ansys/ansys-ls-dyna.md
-    - ANSYS MAPDL: salomon/software/ansys/ansys-mechanical-apdl.md
-    - ANSYS Fluent: salomon/software/ansys/ansys-fluent.md
-    - Setting license preferences: salomon/software/ansys/licensing.md
-    - Licensing and Available Versions: salomon/software/ansys/setting-license-preferences.md
+    - 'Intel Suite':
+      - Introduction: salomon/software/intel-suite/intel-parallel-studio-introduction.md
+      - Intel MKL: salomon/software/intel-suite/intel-mkl.md
+      - Intel Compilers: salomon/software/intel-suite/intel-compilers.md
+      - Intel IPP: salomon/software/intel-suite/intel-integrated-performance-primitives.md
+      - Intel TBB: salomon/software/intel-suite/intel-tbb.md
+      - Intel Debugger: salomon/software/intel-suite/intel-debugger.md
+      - Intel Inspector: salomon/software/intel-suite/intel-inspector.md
+      - Intel Trace Analyzer and Collector: salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
+      - Intel Advisor: salomon/software/intel-suite/intel-advisor.md
+    - 'MPI':
+      - Introduction: salomon/software/mpi/mpi.md
+      - MPI4Py (MPI for Python): salomon/software/mpi/mpi4py-mpi-for-python.md
+      - Running OpenMPI: salomon/software/mpi/Running_OpenMPI.md
+    - 'Debuggers':
+      - Introduction: salomon/software/debuggers/Introduction.md
+      - Valgrind: salomon/software/debuggers/valgrind.md
+      - Allinea Forge (DDT,MAP): salomon/software/debuggers/allinea-ddt.md
+      - Total View: salomon/software/debuggers/total-view.md
+      - Intel VTune Amplifier XE: salomon/software/debuggers/intel-vtune-amplifier.md
+      - Aislinn: salomon/software/debuggers/aislinn.md
+      - Allinea Performance Reports: salomon/software/debuggers/allinea-performance-reports.md
+      - Vampir: salomon/software/debuggers/vampir.md
+    - 'Numerical Languages':
+      - Introduction: salomon/software/numerical-languages/introduction.md
+      - R: salomon/software/numerical-languages/r.md
+      - Matlab: salomon/software/numerical-languages/matlab.md
+      - Octave: salomon/software/numerical-languages/octave.md
+    - 'Chemistry':
+      - Molpro: salomon/software/chemistry/molpro.md
+      - Phono3py: salomon/software/chemistry/phono3py.md
+      - NWChem: salomon/software/chemistry/nwchem.md
+    - 'Comsol':
+      - COMSOL: salomon/software/comsol/comsol-multiphysics.md
+      - Licensing and Available Versions: salomon/software/comsol/licensing-and-available-versions.md
+    - 'Ansys':
+      - Introduction: salomon/software/ansys/ansys.md
+      - Workbench: salomon/software/ansys/workbench.md
+      - ANSYS CFX: salomon/software/ansys/ansys-cfx.md
+      - ANSYS LS-DYNA: salomon/software/ansys/ansys-ls-dyna.md
+      - ANSYS MAPDL: salomon/software/ansys/ansys-mechanical-apdl.md
+      - ANSYS Fluent: salomon/software/ansys/ansys-fluent.md
+      - Setting license preferences: salomon/software/ansys/licensing.md
+      - Licensing and Available Versions: salomon/software/ansys/setting-license-preferences.md
   - PBSPro Documentation: pbspro-documentation/pbspro.md
 
 extra: