diff --git a/assets/css/devportal.css b/assets/css/devportal.css
index 017dd849b0..ab99219ffb 100644
--- a/assets/css/devportal.css
+++ b/assets/css/devportal.css
@@ -542,7 +542,7 @@ th {
 #sidenav_accordion .panel {
   padding: 0;
   border-radius: 0;
-  border-bottom: 1px solid #cccccc;
+  border-top: 1px solid #cccccc;
 }
 
 #sidenav_accordion .panel-heading h5 {
@@ -896,10 +896,18 @@ th {
 * New stuff for 5-level nesting
 *******************************************************************************/
 
-.subcat-title {
+.subcat-title.active-parent {
   font-weight: bold;
 }
 
 #sidenav_accordion .panel .sidebar_cat_pagelist li .subpage {
-  padding-left: 95px;
+  padding-left: 105px;
+}
+
+.sidenav_parent a {
+  display: block;
+  text-decoration: none;
+  font-size: 18px;
+  font-weight: bold;
+  padding: 15px 16px 15px 0;
 }
diff --git a/tool/template-sidebar_nav.html b/tool/template-sidebar_nav.html
index b0f61bd6ed..845614f364 100644
--- a/tool/template-sidebar_nav.html
+++ b/tool/template-sidebar_nav.html
@@ -1,4 +1,9 @@
 <div class="guide_toc">
+  {% if currentpage.doc_type is defined %}
+  <div class="sidenav_parent">
+    <a href="{{ (pages|selectattr('doc_type', 'equalto', currentpage.doc_type)|first).html }}">{{ currentpage.doc_type }}</a>
+  </div>
+  {% endif %}
   <div id="sidenav_accordion" class="panel-group" role="tablist" aria-multiselectable="true">
     {% for cat in categories %}
       {% set catpages = pages|selectattr("category", "equalto", cat)|list %}
@@ -31,6 +36,8 @@
             {% elif page.subcategory not in printed_subcategories %}
               {% if page == currentpage %}
               <li><a class="subcat-title active" href="#main_content_body">{{ page.name }}</a></li>
+              {% elif page.subcategory == currentpage.subcategory %}
+              <li><a class="subcat-title active-parent" href="{{ page.html }}">{{ page.name }}</a></li>
               {% else %}
               <li><a class="subcat-title" href="{{ page.html }}">{{ page.name }}</a></li>
               {% endif %}