diff --git a/_includes/link.html b/_includes/link.html
new file mode 100644
index 0000000000..47b146d5a5
--- /dev/null
+++ b/_includes/link.html
@@ -0,0 +1 @@
+{{ include.url | remove: ".html" | prepend: site.baseurl | replace: '//', '/' }}
\ No newline at end of file
diff --git a/_includes/title.html b/_includes/title.html
new file mode 100644
index 0000000000..09d443c629
--- /dev/null
+++ b/_includes/title.html
@@ -0,0 +1 @@
+{{ include.doc.title | remove_first: include.coll.label | remove_first: "/ "  }}
\ No newline at end of file
diff --git a/_layouts/sidebar.html b/_layouts/sidebar.html
index 2b9d260251..8b33b57a47 100644
--- a/_layouts/sidebar.html
+++ b/_layouts/sidebar.html
@@ -1,26 +1,21 @@
 ---
 layout: default
 ---
-{% for coll in site.collections %}
-    {% if coll.sidebar %}
-        <h2>{{ coll.caption }}</h2>
-        {% for page in coll.docs %}
-            <h3>{{ page.title | remove_first: coll.label | remove_first: '/ '}}</h3>
-        {% endfor %}
-    {% endif %}
-{% endfor %}
 <div class="container" style="padding-top: 24px;">
     <div class="row">
           <div class="col-md-3" id="toc" style="padding-top: 16px;">
-            {% for group in site.data.sidebar %}
-            <div class="list-group">
-                <a class="list-group-item active">{{ group[0] }}</a>
-                {% for link in group[1] %}
-                    <a class="list-group-item" 
-                        href="{% if link.first[1] contains 'http' %}{{ link.first[1] }}{% else %}{{ link.first[1] | prepend: site.baseurl | replace: '//', '/'}}{% endif %}">
-                        {{ link.first[0] }}</a>
-                {% endfor %}
-            </div>
+            {% for coll in site.collections %}
+                {% if coll.sidebar %}
+                    <div class="list-group">
+                        <a class="list-group-item active">{{ coll.caption }}</a>
+                        {% for doc in coll.docs %}
+                            {% capture url %}/{{ site.collections_dir}}/{{ doc.url }}{% endcapture %}
+                            <a class="list-group-item" 
+                                href="{% include link.html url=url %}">
+                                {% include title.html doc=doc coll=coll %}</a>
+                        {% endfor %}
+                    </div>
+                {% endif %}
             {% endfor %}
           </div>
           <div class="col-md-9" id="content">