diff --git a/docs/_config.yml b/docs/_config.yml
index 5b4d8d44f..e8793858c 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -96,6 +96,20 @@ sidebar:
           url: /configuration/
         - title: Advanced Configuration
           url: /advanced-configuration/
+        - title: Authentication
+          url: /authentication/
+        - title: Configuring the Comment Stream
+          url: /configuring-comment-stream/
+        - title: Configuring the Admin
+          url: /configuring-admin/
+        - title: Notifications
+          url: /notifications/
+        - title: Event Tracking and Metrics
+          url: /event-tracking-metrics/
+        - title: Styling and CSS
+          url: /styling-css/
+        - title: Translations and i18n
+          url: /translations-i18n/
     - title: Product Guide
       children:
         - title: How Talk Works
@@ -151,4 +165,4 @@ marked:
 node_sass:
   outputStyle: compressed
   precision: 5
-  sourceComments: false
\ No newline at end of file
+  sourceComments: false
diff --git a/docs/source/02-03-authentication.md b/docs/source/02-03-authentication.md
index 7b87752c5..de518ce74 100644
--- a/docs/source/02-03-authentication.md
+++ b/docs/source/02-03-authentication.md
@@ -1,6 +1,6 @@
 ---
 title: Authenticating with Talk
-permalink: /authenticating-with-talk/
+permalink: /authentication/
 class: configuration
 toc: true
 ---
diff --git a/docs/source/02-04-configuring-comment-stream.md b/docs/source/02-04-configuring-comment-stream.md
index 204f02cd1..e940336b7 100644
--- a/docs/source/02-04-configuring-comment-stream.md
+++ b/docs/source/02-04-configuring-comment-stream.md
@@ -1,3 +1,9 @@
+---
+title: Configuring the Talk Comment Stream
+permalink: /configuring-comment-stream/
+class: configuration
+toc: true
+---
 
 Using plugins and configuration variables, you can modify the way the Talk comment stream behaves. Here are some common configuration options:
 
diff --git a/docs/source/02-05-configuring-admin.md b/docs/source/02-05-configuring-admin.md
index baecc9c10..2497e9156 100644
--- a/docs/source/02-05-configuring-admin.md
+++ b/docs/source/02-05-configuring-admin.md
@@ -1,6 +1,6 @@
 ---
 title: Configuring the Talk Admin
-permalink: /configuring-the-admin/
+permalink: /configuring-admin/
 class: configuration
 toc: true
 ---
diff --git a/docs/source/02-06-notifications.md b/docs/source/02-06-notifications.md
index 58217349d..f4c559083 100644
--- a/docs/source/02-06-notifications.md
+++ b/docs/source/02-06-notifications.md
@@ -1,6 +1,6 @@
 ---
 title: Notifications
-permalink: /notifications//
+permalink: /notifications/
 class: configuration
 toc: true
 ---
diff --git a/docs/source/02-07-talk-metrics.md b/docs/source/02-07-event-tracking-metrics.md
similarity index 98%
rename from docs/source/02-07-talk-metrics.md
rename to docs/source/02-07-event-tracking-metrics.md
index 7aef2727e..83f7d0f4c 100644
--- a/docs/source/02-07-talk-metrics.md
+++ b/docs/source/02-07-event-tracking-metrics.md
@@ -1,6 +1,6 @@
 ---
 title: Tracking Talk Events and Metrics
-permalink: /talk-metrics/
+permalink: /event-tracking-metrics/
 class: configuration
 toc: true
 ---