diff --git a/_config.yml b/_config.yml
index e4dd4631e7..5fff0010ea 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,12 +10,16 @@ favicon: /static/images/favicon.png
 defaults:
   -
     scope:
-      path: docs
+      path: ""
     values:
       layout: sidebar
 
 collections_dir: docs
 collections:
+  install-and-build:
+    output: true
+    caption: Install and build
+    sidebar: true
   Mobile:
     output: true
     caption: Mobile-related
diff --git a/_layouts/sidebar.html b/_layouts/sidebar.html
index 8b33b57a47..072703079f 100644
--- a/_layouts/sidebar.html
+++ b/_layouts/sidebar.html
@@ -9,9 +9,8 @@ layout: default
                     <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 %}">
+                                href="{% include link.html url=doc.url %}">
                                 {% include title.html doc=doc coll=coll %}</a>
                         {% endfor %}
                     </div>
@@ -20,7 +19,7 @@ layout: default
           </div>
           <div class="col-md-9" id="content">
             {% if page.title %}
-            <h1 class="featurette-heading">{{ page.title }}</h1>
+            <h1 class="featurette-heading">{% include title.html doc=page coll=page.collection %}</h1>
             {% endif %}
 
             {{ content }}