diff --git a/docs/_includes/f_sidebar_nav.html b/docs/_includes/f_sidebar_nav.html
new file mode 100644
index 000000000..e0b1c187a
--- /dev/null
+++ b/docs/_includes/f_sidebar_nav.html
@@ -0,0 +1,36 @@
+
+{% if include.item.children %}
+
+    <a href="#submenu_{{include.id}}" aria-controls="submenu_{{include.id}}" data-toggle="collapse" aria-expanded="false" class="bd-toc-link dropdown-toggle">{{include.item.title}}</a>
+
+    {% assign pageurl = page.url | remove: '.html' %}
+
+    {% capture capturechild %}
+        {% for child in include.item.children %}
+
+
+        {% assign active = "" %}
+        {% if pageurl == child.url %}
+            {% assign active = "active bd-sidenav-active" %}
+        {% endif %}
+
+        <li class="hello {{active}}">
+            {% assign childid = include.id | append: '_' | append: forloop.index %}
+            {% include f_sidebar_nav.html item=child id=childid %}
+        </li>
+
+        {% endfor %}
+    {% endcapture %}
+
+    {% assign show = "" %}
+    {% if capturechild contains 'bd-sidenav-active' %}
+        {% assign show = "show" %}
+    {% endif %}
+
+    <ul class="collapse nav bd-sidenav {{show}}" id="submenu_{{include.id}}">
+        {{ capturechild }}
+    </ul>
+{% else %}
+
+    <a href="{{include.item.url | relative_url}}">{{include.item.title}}</a>
+{% endif %}
\ No newline at end of file
diff --git a/docs/_includes/sidebar.html b/docs/_includes/sidebar.html
index b665c478d..c52d76f49 100644
--- a/docs/_includes/sidebar.html
+++ b/docs/_includes/sidebar.html
@@ -1,37 +1,11 @@
 <div  class="col-12 col-md-3 col-xl-2 bd-sidebar">
     
     <nav class="collapse bd-links" id = "sidebar">
-
-        {% for category in site.data.navigation %}
-            {% assign catid = forloop.index %}
-            <div class="bd-toc-item">
-                <a href="#submenu_{{catid}}" aria-controls="submenu_{{catid}}" data-toggle="collapse" aria-expanded="false" class="bd-toc-link dropdown-toggle">{{category.title}}</a>
-            
-                <ul class="collapse nav bd-sidenav" id="submenu_{{catid}}">
-                    
-                    {% for document in category.children %}  
-                        {% assign docid = forloop.index %}                 
-                        <li>
-                            
-                            {% if document.children %}
-                                <a href="#submenu_{{catid}}_{{docid}}" aria-controls="submenu_{{catid}}_{{docid}}" data-toggle="collapse" aria-expanded="false" class="bd-toc-link dropdown-toggle">{{document.title}}</a>
-                                <ul class="collapse nav bd-sidenav" id="submenu_{{catid}}_{{docid}}">
-                                    {% for child in document.children %}  
-                                        <li>
-                                            <a href="{{child.url | relative_url}}">{{child.title}}</a>
-                                        </li>
-                                    {% endfor %}
-                                </ul>
-                            {% else %}
-                                <a href="{{document.url | relative_url}}">{{document.title}}</a>
-
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
+        {% for child in site.data.navigation %}
+            <div class="bd-toc-item">            
+                {% assign childid = ("submenu_" | append: forloop.index) %}
+                {% include f_sidebar_nav.html item=child id=childid %}
             </div>
         {% endfor %}
-
     </nav>
-
 </div>
\ No newline at end of file