diff --git a/_includes/footer.html b/_includes/footer.html
index 01abd9f649..14ae6c0a9c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,6 +1,7 @@
-  <!-- newsletter -->
+
   <div class="newsletter_section">
       <div class="container">
+        <!-- newsletter
           <div class="col-md-8">
               <form class="form-inline">
                   <div class="form-group">
@@ -8,7 +9,7 @@
                       <button type="submit" class="button outline-btn newsletter">Submit</button>
                   </div>
               </form>
-          </div>
+          </div>-->
       </div>
   </div>
     <div class="container">
diff --git a/_layouts/docs.html b/_layouts/docs.html
index 0bbb387e1e..743c2aa9ba 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -41,14 +41,14 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
 	<meta name="robots" content="noindex">{% endif %}
 	<meta property="og:type" content="website"/>
 	<meta property="og:updated_time" content="{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}"/>
-	<meta property="og:image" itemprop="image primaryImageOfPage" content="https://www.docker.com/sites/default/files/social/docker-facebook-share.png"/>
+	<meta property="og:image" itemprop="image primaryImageOfPage" content="/images/docs@2x.png"/>
 	<meta name="twitter:card" content="summary"/>
 	<meta name="twitter:domain" content="docs.docker.com"/>
 	<meta name="twitter:site" content="@docker_docs"/>
 	<meta name="twitter:url" content="https://twitter.com/docker_docs"/>
 	<meta name="twitter:title" itemprop="title name" content="{{ page.title }}"/>
 	<meta name="twitter:description" property="og:description" itemprop="description" content="{{ content | strip_html | truncatewords: 30}}" />
-	<meta name="twitter:image:src" content="https://www.docker.com/sites/default/files/social/docker-twitter-share.png"/>
+	<meta name="twitter:image:src" content="/images/docs@2x.png"/>
 	<meta name="twitter:image:alt" content="Docker Documentation"/>
 	<meta property="article:published_time" content="{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}"/>
 
@@ -114,7 +114,7 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
 						</div>
 					</nav>
 					<div class="col-toc">
-							<div id="{% if page.landing == true %}sidebar-wrapper-home{%else%}sidebar-wrapper{% endif %}" class="{% if page.landing == true %} affix-top{%else%}sidebar-wrapper toc-nav{% endif %}" {% if page.landing == true %} data-spy="affix" data-offset-top="490">{%else%}{% endif %}
+							<div id="{% if page.landing == true %}sidebar-wrapper-home{%else%}sidebar-wrapper{% endif %}" class="{% if page.landing == true %} affix-top{%else%}sidebar-wrapper toc-nav{% endif %}" {% if page.landing == true %} data-spy="affix" data-offset-top="490"{% endif %}>
 							<div class="toc-nav">
 								<div class="feedback-links">
 									<ul>
diff --git a/images/docs.png b/images/docs.png
new file mode 100644
index 0000000000..4095a0a70c
Binary files /dev/null and b/images/docs.png differ
diff --git a/images/docs@2x.png b/images/docs@2x.png
new file mode 100644
index 0000000000..15d39ecd5d
Binary files /dev/null and b/images/docs@2x.png differ
diff --git a/js/docs.js b/js/docs.js
index 33e596dda8..10541e5739 100644
--- a/js/docs.js
+++ b/js/docs.js
@@ -80,12 +80,14 @@ function checkNavSizes()
   headerOffset = document.getElementsByClassName("container-fluid")[0].getBoundingClientRect().bottom;
   if (footerTop < sidebarBottom || (sidebarBottom < footerTop && sidebarBottom < $(window).height()))
   {
+
     // the footer is overlapping the sidebar
-    var sidebarHeight = ((footerTop - headerOffset) < $(window).height()) ? (footerTop - headerOffset) : $(window).height();
+    var sidebarHeight = (footerTop < $(window).height()) ? footerTop : $(window).height();
     var tocNavHeight = (footerTop < $(window).height()) ? footerTop : $(window).height();
     sidebarObj.style.height = sidebarHeight + "px";
-    document.getElementsByClassName("toc-nav")[0].style.height = footerTop + "px";
-    highlightRightNav(currentHeading);
+    document.getElementsByClassName("toc-nav")[0].style.height = tocNavHeight + "px";
+    $(sidebarObj).clearQueue().finish();
+    setTimeout(highlightRightNav(currentHeading),1);
   }
 }
 $(window).resize(function() {