diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1320f90
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+site
diff --git a/docs/home_network/index.md b/docs/home_network/index.md
index 8a78e38..e013805 100644
--- a/docs/home_network/index.md
+++ b/docs/home_network/index.md
@@ -1,3 +1,3 @@
 
-- [Setting up radv (router)](radv.html)
-- [Setting up SLAAC (hosts)](slaac.html)
+- [Setting up radv (router)](radv)
+- [Setting up SLAAC (hosts)](slaac)
diff --git a/docs/people.md b/docs/people.md
index 511233a..e95cffe 100644
--- a/docs/people.md
+++ b/docs/people.md
@@ -23,7 +23,7 @@ Matrix: `deavmi@envs.net`
 Amazing German dude.
 
 Roles: Network services, Routing
-BNET IRC: `chris2001`
+BNET IRC: `chris2001` on `#crxn`
 
 ### Ty3r0X `~ty3r0x`
 
diff --git a/mkdocs.yml b/mkdocs.yml
index ee8cf2b..4edd687 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -2,31 +2,36 @@ site_name: CRXN
 theme: readthedocs
 
 nav:
-   - Home: index
+   - Home: ./
+
    - Getting started:
       - Guide: getting-started
-      - Rules: rules
-      - Requirements: requirements
-      - Registration:
-         - Registering and adding your prefix to EntityDB: registration/entitydb
-      - Network configuration: network/setup
+      - Rules: getting-started/rules
+      - Requirements: getting-started/requirements
+      - Registration: getting-started/registration
+
       - Routing:
-         - Fowarding: routing/bird/forwarding
+         - Fowarding: routing/forwarding
          - Setting up Bird: routing/bird/bird
+
       - Tunneling:
          - Fastd: tunneling/fastd
+         - WireGuard: tunneling/wireguard
+
       - Setting up your home network:
          - Configuring your hosts:
             - Automatically with SLAAC and radv:
-               - Setting up radv (router): radv/index
-               - Setting up SLAAC (hosts): slaac/slaac   
-      - Using the network: usage/index
+               - Setting up radv (router): home_network/radv
+               - Setting up SLAAC (hosts): home_network/slaac
+               - DNS: home_network/dns
+
    - Additional:
-      - CRXN DNS: dns/dns
-      - DN42 interconnection: dn42
+      - DNS: additional/dns
+      - DN42 interconnection: additional/dn42_interconnection
       - On-the-go CRXN:
-         - What is it?: otg/index
-         - Deavmi's OTG: otg/deavmi
+         - What is it?: additional/otg/
+         - Deavmi's OTG: additional/otg/deavmi
+
    - Peers: peers
    - Services: services
-   - People: people/people
+   - People: people