diff --git a/source/_includes/asides/docs_navigation.html b/source/_includes/asides/docs_navigation.html
index f3351b1d62..cb9df625bc 100644
--- a/source/_includes/asides/docs_navigation.html
+++ b/source/_includes/asides/docs_navigation.html
@@ -3,7 +3,11 @@
     <h1 class="title delta">Topics</h1>
     <ul class='divided sidebar-menu'>
       <li>
-        {% active_link /docs/installation/ Installation %}
+        <b>{% active_link /faq/ FAQ %}</b>
+      </li>
+      <li>
+      <li>
+        <b>{% active_link /docs/installation/ Installation %}</b>
         <ul>
           <li>{% active_link /docs/installation/virtualenv/ Python Virtual Env %}</li>
           <li>{% active_link /docs/installation/raspberry-pi-all-in-one/ Raspberry Pi All-in-One %}</li>
@@ -12,7 +16,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/hassbian/ Hassbian %}
+        <b>{% active_link /docs/hassbian/ Hassbian %}</b>
         <ul>
           <li>{% active_link /docs/hassbian/installation/ Installation %}</li>
           <li>{% active_link /docs/hassbian/customization/ Customization %}</li>
@@ -22,7 +26,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/configuration/ Configuration  %}
+        <b>{% active_link /docs/configuration/ Configuration %}</b>
         <ul>
           <li>{% active_link /docs/configuration/yaml/ YAML %}</li>
           <li>{% active_link /docs/configuration/basic/ Basic information %}</li>
@@ -33,7 +37,7 @@
         </ul>
       </li>
       <li>
-        Advanced Configuration
+        <b>Advanced Configuration</b>
         <ul>
           <li>{% active_link /docs/configuration/remote/ Remote access %}</li>
           <li>{% active_link /docs/configuration/packages/ Packages %}</li>
@@ -45,14 +49,14 @@
         </ul>
       </li>
       <li>
-        Core objects
+        <b>Core objects</b>
         <ul>
           <li>{% active_link /docs/configuration/events/ Events %}</li>
           <li>{% active_link /docs/configuration/state_object/ State Objects %}</li>
         </ul>
       </li>
       <li>
-        {% active_link /docs/automation/ Automation %}
+        <b>{% active_link /docs/automation/ Automation %}</b>
         <ul>
           <li>{% active_link /docs/automation/examples/ Examples %}</li>
           <li>{% active_link /docs/automation/editor/ Editor %}</li>
@@ -63,7 +67,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/frontend/ Frontend %}
+        <b>{% active_link /docs/frontend/ Frontend %}</b>
         <ul>
           <li>{% active_link /docs/frontend/mobile/ Android/iOS Homescreen %}</li>
           <li>{% active_link /docs/frontend/webserver/ Web server fingerprint %}</li>
@@ -71,7 +75,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/backend/ Backend %}
+        <b>{% active_link /docs/backend/ Backend %}</b>
         <ul>
           <li>{% active_link /docs/backend/database/ Database %}</li>
           <li>{% active_link /docs/backend/updater/ Updater %}</li>
@@ -79,14 +83,14 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/scripts/ Scripts %}
+        <b>{% active_link /docs/scripts/ Scripts %}</b>
         <ul>
           <li>{% active_link /docs/scripts/service-calls/ Service Calls %}</li>
           <li>{% active_link /docs/scripts/conditions/ Conditions %}</li>
         </ul>
       </li>
       <li>
-        {% active_link /docs/tools/ Tools and Helpers %}
+        <b>{% active_link /docs/tools/ Tools and Helpers %}</b>
         <ul>
           <li>{% active_link /docs/tools/dev-tools/ Developer Tools %}</li>
           <li>{% active_link /docs/tools/hass/ hass %}</li>
@@ -94,7 +98,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/z-wave/ Z-Wave %}
+        <b>{% active_link /docs/z-wave/ Z-Wave %}</b>
         <ul>
           <li>{% active_link /docs/z-wave/controllers/ Controllers %}</li>
           <li>{% active_link /docs/z-wave/settings/ Modifying Settings %}</li>
@@ -102,7 +106,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/mqtt/ MQTT %}
+        <b>{% active_link /docs/mqtt/ MQTT %}</b>
         <ul>
           <li>{% active_link /docs/mqtt/broker/ Broker %}</li>
           <li>{% active_link /docs/mqtt/certificate/ Certificate %}</li>
@@ -115,7 +119,7 @@
         </ul>
       </li>
       <li>
-        {% active_link /docs/ecosystem/ios/ iOS %}
+        <b>{% active_link /docs/ecosystem/ios/ iOS %}</b>
         <ul>
           <li>{% active_link /docs/ecosystem/ios/notifications/basic/ Basic notifications %}</li>
           <ul>