diff --git a/_data/topnav.yml b/_data/topnav.yml
index d15fe66be..4e40f2121 100644
--- a/_data/topnav.yml
+++ b/_data/topnav.yml
@@ -11,7 +11,7 @@ topnav_dropdowns:
     - title: View
       folderitems:
         - title: LoopBack Overview
-          url: /
+          url: /doc/
         - title: LoopBack 4
           url: /doc/en/lb4/
         - title: LoopBack 3.x
diff --git a/_includes/footer.html b/_includes/footer.html
index 521fec78f..7120d7d8f 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,7 +5,7 @@
 {% if page.last_updated %}<p>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }}
               </div>
               <div class="col-md-6 footer-right">
-                <p><img src="{{site.url}}/images/company_logo.png" alt="Company logo"/></p>
+                <p><img src="{{site.baseurl | prepend: site.url}}/images/company_logo.png" alt="Company logo"/></p>
               </div>
             </div>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 5b2121051..8f459eedb 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,6 +1,4 @@
-{% if jekyll.environment == "production" %}
-  {% assign base = site.url %}
-{% endif %}
+{% assign base = site.baseurl | prepend: site.url %}
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/_includes/sidebar_menu_list_items.liquid b/_includes/sidebar_menu_list_items.liquid
index b69d6ac50..f13e6e903 100644
--- a/_includes/sidebar_menu_list_items.liquid
+++ b/_includes/sidebar_menu_list_items.liquid
@@ -5,15 +5,20 @@
   <li class="{% if item.children.size > 0 %} {% if item.expand == 'true' %} tree-parent-expand {%else%} tree-parent {% endif %} {%else%} leaf-node {% endif %} {% if pageurl.last == item.url %}active{% endif %}">
     {% if item.children.size > 0 %} <a class="show-hide" href="#"></span> {% endif %}
     {% if item.url %}
-      <a class="page-link" href="{{item.url}}">{{ item.title }}</a>
+      {% assign itemUrl = item.url %}
+      {% assign itemUrlFirstChar = item.url | slice: 0 == '/' %}
+      {% if  itemUrlFirstChar == "/" "%}
+        {% assign itemUrl = itemUrl | prepend: site.baseurl %}
+      {% endif %}
+      <a class="page-link" href="{{itemUrl}}">{{ item.title }}</a>
     {% else %}
       <a class="section-name" href="#">{{ item.title }}</a>
     {% endif %}
-      {% if item.children.size > 0 %}
-      <ul class="nav-list">
-          {% include sidebar_menu_list_items.liquid menuitems=item.children %}
-      </ul>
-      {% endif %}
+    {% if item.children.size > 0 %}
+    <ul class="nav-list">
+        {% include sidebar_menu_list_items.liquid menuitems=item.children %}
+    </ul>
+    {% endif %}
   </li>
   {% endif %}{% comment %} /"if web" {% endcomment %}
 
diff --git a/_includes/topnav.html b/_includes/topnav.html
index 7ab991941..8949ea4a4 100644
--- a/_includes/topnav.html
+++ b/_includes/topnav.html
@@ -40,9 +40,9 @@
                           {% if folderitem.external_url %}
                             <li><a href="{{folderitem.external_url}}" target="_blank">{{folderitem.title}}</a></li>
                           {% elsif page.url contains folderitem.url and folderitem.title != 'LoopBack Overview' %}
-                            <li class="dropdownActive"><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
+                            <li class="dropdownActive"><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
                           {% else %}
-                            <li><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
+                            <li><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a></li>
                           {% endif %}
                         {% endfor %}
                     </ul>
diff --git a/index.html b/index.html
index cebb360aa..0e57e5d29 100644
--- a/index.html
+++ b/index.html
@@ -438,7 +438,7 @@ <h3 style="color:white">Ready to build amazing things?
         <div id="footer-template"></div>
     </footer>
 
-    <script src="/dist/jquery/jquery-3.4.1.min.js" crossorigin="anonymous"></script>    
+    <script src="dist/jquery/jquery-3.4.1.min.js" crossorigin="anonymous"></script>    
     <script src="dist/popper/1.14.0/umd/popper.min.js"></script>
     <!-- Bootstrap core JavaScript -->
     <script src="dist/bootstrap/js/bootstrap.min.js"></script>