diff --git a/docs/alpine-desktop-setup/home.md b/docs/alpine-desktop-setup/index.md
similarity index 93%
rename from docs/alpine-desktop-setup/home.md
rename to docs/alpine-desktop-setup/index.md
index 2845534..6ecaab1 100644
--- a/docs/alpine-desktop-setup/home.md
+++ b/docs/alpine-desktop-setup/index.md
@@ -1,3 +1,3 @@
-# An Alpine Linux desktop installation
+# Alpine-desktop setup
 
 This guide will demonstrate how to install [Alpine Linux](https://www.alpinelinux.org/) as a desktop with encryption, secureboot and a graphical wayland session using wayfire. Alpine Linux makes a perfect base for those who want a minimal, simple and secure Linux installation. This installation will also make heavy use of [Nix](https://nixos.org/) and [Home-manager](https://github.com/nix-community/home-manager) which allows for easy deployment and user independent packages. Check out the [Alpine Linux wiki](https://wiki.alpinelinux.org/wiki/Main_Page) for additional resources and information.
diff --git a/docs/alpine-server-setup/home.md b/docs/alpine-server-setup/index.md
similarity index 89%
rename from docs/alpine-server-setup/home.md
rename to docs/alpine-server-setup/index.md
index e46eff5..bca9a2d 100644
--- a/docs/alpine-server-setup/home.md
+++ b/docs/alpine-server-setup/index.md
@@ -1,3 +1,3 @@
-# An Alpine Linux server installation
+# Alpine-server setup
 
 This is a relatively simple and easy setup for an [Alpine Linux](https://www.alpinelinux.org/) server. Alpine Linux makes a good base for a server because of its simplicity, lightweightness and security. Check out the [Alpine Linux wiki](https://wiki.alpinelinux.org/wiki/Main_Page) for additional resources and information.
diff --git a/docs/void-desktop-setup/home.md b/docs/void-desktop-setup/index.md
similarity index 82%
rename from docs/void-desktop-setup/home.md
rename to docs/void-desktop-setup/index.md
index 1ab2256..0da39b7 100644
--- a/docs/void-desktop-setup/home.md
+++ b/docs/void-desktop-setup/index.md
@@ -1,3 +1,3 @@
-# A Void Linux desktop installation
+# Void-desktop setup
 
-This install is based on the [EFI boot stub](https://mth.st/blog/void-efistub/) blog entry of [Matthias Totschnig](https://mth.st/), the [Void Handbook](https://docs.voidlinux.org/about/index.html) and the Void Linux [man pages](https://man.voidlinux.org/man-pages.7). This guide focuses on a Void Linux x86_64 glibc/musl install on uefi. In this install gummiboot is used as bootloader and the root partition will be encrypted.
\ No newline at end of file
+This install is based on the [EFI boot stub](https://mth.st/blog/void-efistub/) blog entry of [Matthias Totschnig](https://mth.st/), the [Void Handbook](https://docs.voidlinux.org/about/index.html) and the Void Linux [man pages](https://man.voidlinux.org/man-pages.7). This guide focuses on a Void Linux x86_64 glibc/musl install on uefi. In this install gummiboot is used as bootloader and the root partition will be encrypted.
diff --git a/mkdocs.yml b/mkdocs.yml
index bc3b90b..ce2e5ca 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -5,8 +5,10 @@ theme:
   name: material
   features:
     - navigation.instant
-    - navigation.instant.prefetch
+    - navigation.instant.progress
     - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.indexes
     - toc.follow
   logo: assets/lnco-logo.png
   favicon: assets/lnco-logo.png
@@ -43,7 +45,7 @@ nav:
   - 'Home': index.md
   
   - 'Alpine-desktop setup':
-    - 'Start': alpine-desktop-setup/home.md
+    -  alpine-desktop-setup/index.md
     - 'Provisioning': alpine-desktop-setup/provisioning.md
     - 'Installation': alpine-desktop-setup/installation.md
     - 'Post installation':
@@ -73,7 +75,7 @@ nav:
       - 'Auto-mounting': alpine-desktop-setup/graphical-session/auto-mounting.md
 
   - 'Alpine-server setup': 
-    - 'Start': alpine-server-setup/home.md
+    - alpine-server-setup/index.md
     - 'Provisioning': alpine-server-setup/installation/provisioning.md
     - 'Installation': alpine-server-setup/installation/installation.md
     - 'Post installation':
@@ -90,7 +92,7 @@ nav:
       - 'Homeassistant': alpine-server-setup/docker/homeassistant.md
 
   - 'Void-desktop setup':
-    - 'Start': void-desktop-setup/home.md
+    - void-desktop-setup/index.md
     - 'Installation':
       - 'Installation with LVM (recommended)':
         - 'Provisioning': void-desktop-setup/installation/provisioning-with-lvm.md