diff --git a/_layouts/docs.html b/_layouts/docs.html
index 2a6238bbf1..0bbb387e1e 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -149,40 +149,6 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
 								{% endunless %}
 						</div>
 					</div>
-					<script language="javascript">
-							var x = document.links.length;
-							var baseHref = document.getElementsByTagName('base')[0].href
-							for (i = 0; i < x; i++) {
-								var munged = false;
-								var thisHREF = document.links[i].href;
-								var originalURL = "{{ page.url }}";
-								if (thisHREF.indexOf(baseHref + "#") > -1) {
-									// hash fix
-									//console.log('BEFORE: base:',baseHref,'thisHREF:',thisHREF,'originalURL:',originalURL);
-									thisHREF = originalURL + thisHREF.replace(baseHref, "");
-									//console.log('AFTER: base:',baseHref,'thisHREF:',thisHREF,'originalURL:',originalURL);
-								}
-								if ((thisHREF.indexOf(window.location.hostname) > -1 || thisHREF.indexOf('http') == -1) && document.links[i].className.indexOf("nomunge") < 0) {
-									munged = true;
-									thisHREF = thisHREF.replace(".md", "/").replace("/index/", "/");
-									document.links[i].setAttribute('href', thisHREF);
-								}
-							}
-						</script>
-					<script language="javascript">
-					// ensure that the left nav visibly displays the current topic
-					var current = document.getElementsByClassName("active currentPage");
-					if (current[0]) {
-							var container = document.getElementsByClassName("sidebar");
-							if (container[0]) {
-								current[0].scrollIntoView(true);
-								container[0].scrollTop -= 150;
-							}
-						}
-					</script>
-
-
-
 				</div>
 			</div>
 		</div>
diff --git a/allpagelinks.md b/allpagelinks.md
deleted file mode 100644
index b04bf1c218..0000000000
--- a/allpagelinks.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-hide_from_sitemap: true
-layout: null
-title: All site links for docs.docker.com
----
-
-{% assign pages = site.pages | sort:"path" %}
-{% for page in pages %}
-  {% unless page.layout == null %}
-    {% unless page.title == nil %}
-- [{{page.title}}]({{page.url}})
-    {% endunless %}
-  {% endunless %}
-{% endfor %}
diff --git a/css/temp.css b/css/temp.css
index 747f1bf620..ad39a2d8ba 100644
--- a/css/temp.css
+++ b/css/temp.css
@@ -3,6 +3,11 @@
 * this css will be integrated into master. for now testing.......
 *
 */
+.toc-nav
+{
+  padding-bottom: 50px !important;
+}
+
 .alert-info {
     border: 0;
     border-radius: 0;
diff --git a/js/docs.js b/js/docs.js
index 85542a05d6..c71a8b03d2 100644
--- a/js/docs.js
+++ b/js/docs.js
@@ -1,9 +1,42 @@
 // Right nav highlighting
+var sidebarBottom = document.getElementsByClassName("sidebar")[0].getBoundingClientRect().bottom;
+var footerTop = document.getElementsByClassName("footer")[0].getBoundingClientRect().top;
+var headerOffset = document.getElementsByClassName("container-fluid")[0].getBoundingClientRect().bottom;
+
+var x = document.links.length;
+var baseHref = document.getElementsByTagName('base')[0].href
+for (i = 0; i < x; i++) {
+  var munged = false;
+  var thisHREF = document.links[i].href;
+  var originalURL = "{{ page.url }}";
+  if (thisHREF.indexOf(baseHref + "#") > -1) {
+    // hash fix
+    //console.log('BEFORE: base:',baseHref,'thisHREF:',thisHREF,'originalURL:',originalURL);
+    thisHREF = originalURL + thisHREF.replace(baseHref, "");
+    //console.log('AFTER: base:',baseHref,'thisHREF:',thisHREF,'originalURL:',originalURL);
+  }
+  if ((thisHREF.indexOf(window.location.hostname) > -1 || thisHREF.indexOf('http') == -1) && document.links[i].className.indexOf("nomunge") < 0) {
+    munged = true;
+    thisHREF = thisHREF.replace(".md", "/").replace("/index/", "/");
+    document.links[i].setAttribute('href', thisHREF);
+  }
+}
+
+// ensure that the left nav visibly displays the current topic
+var current = document.getElementsByClassName("active currentPage");
+if (current[0]) {
+    var container = document.getElementsByClassName("sidebar");
+    if (container[0]) {
+      current[0].scrollIntoView(true);
+      container[0].scrollTop -= 150;
+    }
+  }
+
 function highlightRightNav(heading)
 {
   if (heading == "title")
   {
-    history.pushState({},"Top of page on " + document.location.pathname,document.location.protocol +"//"+ document.location.hostname + (location.port ? ':'+location.port: '') + document.location.pathname);
+    history.replaceState({},"Top of page on " + document.location.pathname,document.location.protocol +"//"+ document.location.hostname + (location.port ? ':'+location.port: '') + document.location.pathname);
     $("#my_toc a").each(function(){
       $(this).removeClass("active");
     });
@@ -26,10 +59,11 @@ function highlightRightNav(heading)
         //console.log("right-nav",this.href);
         if (this.href==targetAnchorHREF)
         {
-          history.pushState({},this.innerText,targetAnchorHREF);
+          history.replaceState({},this.innerText,targetAnchorHREF);
           $(this).addClass("active");
+          var sidebarOffset = (sidebarBottom > 200) ? 200 : headerOffset - 20;
           $("#sidebar-wrapper").animate({
-            scrollTop: $("#sidebar-wrapper").scrollTop() + $(this).position().top - 200
+            scrollTop: $("#sidebar-wrapper").scrollTop() + $(this).position().top - sidebarOffset
           },100);
           //document.getElementById("sidebar-wrapper").scrollTop = this.getBoundingClientRect().top - 200;
         } else {
@@ -39,8 +73,25 @@ function highlightRightNav(heading)
     }
   }
 }
+function checkNavSizes()
+{
+  sidebarBottom = document.getElementsByClassName("sidebar")[0].getBoundingClientRect().bottom;
+  footerTop = document.getElementsByClassName("footer")[0].getBoundingClientRect().top;
+  headerOffset = document.getElementsByClassName("container-fluid")[0].getBoundingClientRect().bottom;
+  if (footerTop < sidebarBottom || (sidebarBottom < footerTop && sidebarBottom < $(window).height()))
+  {
+    // the footer is overlapping the sidebar
+    document.getElementsByClassName("sidebar")[0].style.height = (footerTop - headerOffset) + "px";
+    document.getElementsByClassName("toc-nav")[0].style.height = (footerTop) + "px";
+    highlightRightNav(currentHeading);
+  }
+}
+$(window).resize(function() {
+  checkNavSizes();
+});
 var currentHeading = "";
 $(window).scroll(function(){
+  checkNavSizes();
   var headingPositions = new Array();
   $("h1, h2, h3, h4, h5, h6").each(function(){
     if (this.id == "") this.id="title";