diff --git a/docs/QUnit/index.md b/docs/QUnit/index.md
index 5dcf9e9eb..276ab079d 100644
--- a/docs/QUnit/index.md
+++ b/docs/QUnit/index.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Main assertions
+title: Main Methods
 category: main
 categories:
   - topics
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index f22c6b9ef..cc06390c8 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -3,7 +3,7 @@
 ---
 
 <section class="sidebar">
-    <h2>Main methods:</h2>
+    <h2>Main Methods</h2>
     <ul class="sidebar-list">
     {% assign methods = site.pages | where:'categories', 'main' %}
     {% for page in methods %}
@@ -13,7 +13,7 @@ <h2>Main methods:</h2>
     {% endfor %}
     </ul>
 
-    <h2>Assertions:</h2>
+    <h2>Assertions</h2>
     <ul class="sidebar-list">
     {% assign assertions = site.pages | where:'categories', 'assert' %}
     {% for page in assertions %}
@@ -23,7 +23,7 @@ <h2>Assertions:</h2>
     {% endfor %}
     </ul>
 
-    <h2>Config:</h2>
+    <h2>Configuration Tools</h2>
 
     <ul class="sidebar-list">
     {% assign config = site.pages | where:'categories', 'config' %}
@@ -34,7 +34,7 @@ <h2>Config:</h2>
     {% endfor %}
     </ul>
 
-    <h2>Callbacks:</h2>
+    <h2>Callback Handlers</h2>
 
     <ul class="sidebar-list">
     {% assign callbacks = site.pages | where:'categories', 'callbacks' %}
@@ -45,7 +45,7 @@ <h2>Callbacks:</h2>
     {% endfor %}
     </ul>
 
-    <h2>Async control:</h2>
+    <h2>Async Control</h2>
 
     <ul class="sidebar-list">
     {% assign async = site.pages | where:'categories', 'async' %}
diff --git a/docs/_layouts/wrapper.html b/docs/_layouts/wrapper.html
index 4b8f3d0a4..163b5f830 100644
--- a/docs/_layouts/wrapper.html
+++ b/docs/_layouts/wrapper.html
@@ -23,14 +23,35 @@ <h1 class="logo"><a class="logo-link" href="/">QUnit API Docs</a></h1>
                 </div>
                 <nav role="navigation" class="site-nav">
                     <ul class="site-nav-list">
-                        {% assign topics = site.pages | where:'categories', 'topics' %}
-                        {% for topic in topics %}
                         <li class="site-nav-list-item">
-                            <a class="site-nav-list-link" href="{{ topic.url }}">
-                                {{ topic.title }}
+                            <a class="site-nav-list-link" href="/QUnit/">
+                                Main Methods
+                            </a>
+                        </li>
+
+                        <li class="site-nav-list-item">
+                            <a class="site-nav-list-link" href="/assert/">
+                                Assertions
+                            </a>
+                        </li>
+
+                        <li class="site-nav-list-item">
+                            <a class="site-nav-list-link" href="/config/">
+                                Configuration Tools
+                            </a>
+                        </li>
+
+                        <li class="site-nav-list-item">
+                            <a class="site-nav-list-link" href="/callbacks/">
+                                Callback Handlers
+                            </a>
+                        </li>
+
+                        <li class="site-nav-list-item">
+                            <a class="site-nav-list-link" href="/async">
+                                Async Control
                             </a>
                         </li>
-                        {% endfor %}
                     </ul>
                 </nav>
             </div>
diff --git a/docs/callbacks/index.md b/docs/callbacks/index.md
index f617ee4b0..fa6df67d0 100644
--- a/docs/callbacks/index.md
+++ b/docs/callbacks/index.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Callback handlers
+title: Callback Handlers
 category: callbacks
 categories:
   - topics
diff --git a/docs/config/index.md b/docs/config/index.md
index 5d6142279..00961e224 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Configuration tools
+title: Configuration Tools
 category: config
 categories:
   - topics