diff --git a/doc/Installation/Installing-LibreNMS.md b/doc/Installation/Installing-LibreNMS.md
index f161a8c250..42daf207fd 100644
--- a/doc/Installation/Installing-LibreNMS.md
+++ b/doc/Installation/Installing-LibreNMS.md
@@ -18,11 +18,12 @@ If you want to install yourself then we have some new documentation which should
 
 [RHEL / CentOS 7 Nginx](http://docs.librenms.org/Installation/Installation-CentOS-7-Nginx/)
 
+### Old Install Docs
 If the above are missing or incomplete then you can try our old docs below.
 
 [Debian/Ubuntu](http://docs.librenms.org/Installation/Installation-Ubuntu-1404-Apache/)
 
-[RHEL/CentOS](http://docs.librenms.org/Installation/Installation-CentOS-6-Apache-Nginx/
+[RHEL/CentOS](http://docs.librenms.org/Installation/Installation-CentOS-6-Apache-Nginx/)
 
 [Debian/Ubuntu Lighttpd](http://docs.librenms.org/Installation/Installation-Ubuntu-1404-Lighttpd/)
 
diff --git a/doc/index.md b/doc/index.md
index 3e6e8809b0..9816d92dab 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -6,9 +6,10 @@ and submit a pull request.
 
 The docs should provide you with information on various elements to the software:
 
-  - Installation
-  - Support / FAQ
+  - [Installation](http://docs.librenms.org/Installation/Installing-LibreNMS/)
+  - [Support](http://docs.librenms.org/Support/FAQ/#faq3) / [FAQ](http://docs.librenms.org/Support/FAQ/)
+  - [Contributing to LibreNMS](http://docs.librenms.org/General/Contributing/)
   - Developing for LibreNMS
-  - Available extensions
+  - Available extensions (features)
 
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 0d58c748a0..d6ba5cfb89 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
-site_name: LibreNMS Documentation
+site_name: LibreNMS Docs
 theme: mkdocs
 docs_dir: doc
 site_dir: out
@@ -12,3 +12,80 @@ site_author: LibreNMS
 site_description: LibreNMS user and developer documentation
 repo_url: https://github.com/librenms/librenms
 repo_name: GitHub
+pages:
+- Home: index.md
+- Installation:
+    - Installing LibreNMS: Installation/Installing-LibreNMS.md
+    - Ubuntu VM Image: Installation/Ubuntu-image.md
+    - CentOS VM Image: Installation/CentOS-image.md
+    - Ubuntu 16.04 (Nginx): Installation/Installation-Ubuntu-1604-Nginx.md
+    - Ubuntu 16.04 (Apache): Installation/Installation-Ubuntu-1604-Apache.md
+    - CentOS 7 (Nginx): Installation/Installation-CentOS-7-Nginx.md
+    - CentOS 7 (Apache): Installation/Installation-CentOS-7-Apache.md
+    - Older Docs: Installation/Installing-LibreNMS.md
+#    - Ubuntu 14.04 (Nginx): Installation/Installation-Ubuntu-1404-Nginx.md
+#    - Ubuntu 14.04 (Apache): Installation/Installation-Ubuntu-1404-Apache.md
+#    - Ubuntu 14.04 (Lighttpd): Installation/Installation-Ubuntu-1404-Lighttpd.md
+#    - CentOS 6 (Apache/Nginx): Installation/Installation-CentOS-6-Apache-Nginx.md
+    - Migrating from Observium: Installation/Migrating-from-Observium.md
+- General:
+    - General/Acknowledgement.md
+    - General/Callback-Stats-and-Privacy.md
+    - General/Changelog.md
+    - General/Contributing.md
+    - General/Credits.md
+    - General/Updating.md
+    - General/Welcome-to-Observium-users.md
+    - General/Welcome-to-Observium-users.md
+- Extensions:
+    - Extensions/Alerting.md
+    - Extensions/Applications.md
+    - Extensions/Authentication.md
+    - Extensions/Auto-Discovery.md
+    - Extensions/Billing-Module.md
+    - Extensions/Component.md
+    - Extensions/Dell-OpenManage.md
+    - Extensions/Device-Groups.md
+    - Extensions/Distributed-Poller.md
+    - Extensions/Email-Alerting.md
+    - Extensions/Globe-Frontpage.md
+    - Extensions/Graylog.md
+    - Extensions/IRC-Bot.md
+    - Extensions/IRC-Bot-Extensions.md
+    - Extensions/InfluxDB.md
+    - Extensions/Interface-Description-Parsing.md
+    - Extensions/MIB-based-polling.md
+    - Extensions/Memcached.md
+    - Extensions/Network-Map.md
+    - Extensions/Oxidized.md
+    - Extensions/Plugin-System.md
+    - Extensions/Poller-Service.md
+    - Extensions/Port-Description-Parser.md
+    - Extensions/Proxmox.md
+    - Extensions/RRDCached.md
+    - Extensions/RRDTune.md
+    - Extensions/SNMP-Proxy.md
+    - Extensions/SNMP-Trap-Handler.md
+    - Extensions/Services.md
+    - Extensions/Smokeping.md
+    - Extensions/Sub-Directory.md
+    - Extensions/Syslog.md
+    - Extensions/Two-Factor-Auth.md
+    - Extensions/Varnish.md
+- Developing:
+    - Developing/Code-Guidelines.md
+    - Developing/Code-Structure.md
+    - Developing/Dynamic-Config.md
+    - Developing/Sensor-State-Support.md
+    - Developing/Style-Guidelines.md
+    - Developing/Using-Git.md
+- API: API/API-Docs.md
+- Support:
+    - Support/Configuration.md
+    - Support/Discovery Support.md
+    - Support/FAQ.md
+    - Support/Features.md
+    - Support/Install Validation.md
+    - Support/Performance.md
+    - Support/Poller Support.md
+    - Support/Support-New-OS.md