diff --git a/docs/_data/nav2.yml b/docs/_data/navigation.yml
similarity index 60%
rename from docs/_data/nav2.yml
rename to docs/_data/navigation.yml
index a8e1a85b6..eab936b2b 100644
--- a/docs/_data/nav2.yml
+++ b/docs/_data/navigation.yml
@@ -1,4 +1,4 @@
-toc2:
+sidebar:
   - title: Installation
     subfolderitems:
       - page: Quick Install
@@ -20,47 +20,14 @@ toc2:
       - page: FAQ
         url: faq
       - page:  
-  - title: Interface tour
+  - title: Using LibreTime
     subfolderitems:
-      - page: Upload
+      - page: Interface Tour
         url: upload
-      - page: Dashboard
-        url: dashboard
-      - page: Tracks
-        url: tracks
-      - page: Playlists
-        url: playlists
-      - page: Smartblocks
-        url: smartblocks
-      - page: Webstreams
-        url: webstreams
-      - page: Podcasts
-        url: podcasts
-      - page: Calendar
-        url: calendar
-      - subtitle: Settings
-        subsubfolderitems:
-          - page: General Settings
-            url: general-settings
-          - page: Users
-            url: users
-          - page: Stream Settings
-            url: stream-settings
-          - page: Status
-            url: status
-      - subtitle: Analytics
-        subsubfolderitems:
-          - page: Playout History
-            url: history
-          - page: History Templates
-            url: history-templates
-          - page: Listener Stats
-            url: listener-stats
-      - page: Help
-        url: help
-      - url: Listen
-        page: listen
-  - title: Tutorials
+      - page: Tutorials
+        url: manual
+      - page:     
+  - title: Configuring LibreTime
     subfolderitems:
       - page: Contents
         url: manual
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 0e41134b8..0229ea738 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -54,17 +54,14 @@
         {% endif %}
         
         <div>
-          {% for item in site.data.nav2.toc2 %}
+          {% for item in site.data.navigation.sidebar %}
             <br><strong>{{ item.title }}</strong>
               {% if item.subfolderitems[0] %}
                   {% for entry in item.subfolderitems %}
-                    {% if item.subtitle %}
-                      <br>{{ item.subtitle }}
-                    {% endif %}
                       <br><a href="{{ entry.url }}">{{ entry.page }}</a>
                         {% if entry.subsubfolderitems[0] %}
                           {% for subentry in entry.subsubfolderitems %}
-                             <br> &nbsp; &nbsp; &nbsp; &nbsp; <a href="{{ subentry.url }}">{{ subentry.page }}</a>
+                             <br> &nbsp; -- <a href="{{ subentry.url }}">{{ subentry.page }}</a>
                           {% endfor %}
                         {% endif %}
                   {% endfor %}