diff --git a/_includes/treebuilder.html b/_includes/treebuilder.html
index d7bb4c2cf3..e98e5c543b 100644
--- a/_includes/treebuilder.html
+++ b/_includes/treebuilder.html
@@ -1,11 +1,12 @@
 {% for section in site.data.toc.horizontalnav %}
   {% assign topicFound="false" %}
+  {% assign activeCSS = "" %}
   {% assign tree = site.data.toc[section.node] %}
   <!-- path comparison: item.path: {{ item.path }} == page.path: {{ page.url }} -->
   {% capture thisSection %}{% include tree.html %}{% endcapture %}
   {% if section.path == page.url or thisSection contains "active currentPage" %}
-    <span id="currentSection" style="display:none;">{{ section.node }}</span>
-    {{ thisSection }}
-    {% break %}
+    {% capture leftnav %}{{ thisSection }}{% endcapture %}
+    {% capture activeCSS %} class="active"{% endcapture %}
   {% endif %}
+  <li id="{{ section.node }}"{{ activeCSS }}><a href="{{ section.path }}">{{ section.title }}</a></li>
 {% endfor %}
diff --git a/_layouts/docs.html b/_layouts/docs.html
index 4942276041..ae3e8c1009 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -193,8 +193,8 @@ ng\:form {
       <section class="title_section darkblue"> </section>
 			<div class="col-md-12" style="background-color: #254356">
 					<!-- tabs -->
-					<ul class="tabs">{% for section in site.data.toc.horizontalnav %}
-							<li id="{{ section.node }}"><a href="{{ section.path }}">{{ section.title }}</a></li>{% endfor %}
+					<ul class="tabs">
+						{% include treebuilder.html %}
 					</ul>
 			</div>
       <div class="">
@@ -205,7 +205,7 @@ ng\:form {
                              {% if page.tree == false %}
                                 <li class="leaf"><a href="/">Back to the index</a></li>
                              {% else %}
-								{% include treebuilder.html %}
+								{{ leftnav }}
                              {% endif %}
 							</ul>           
               </div>
diff --git a/js/menu.js b/js/menu.js
index bb0c1ee351..337bc2f105 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -1,6 +1,3 @@
----
-layout: null
----
 var metadata;
 var autoCompleteShowing = false;
 var displayingAutcompleteResults = new Array();