diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 46aa946..1d855ff 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -41,6 +41,56 @@
     </script>
 {% endblock %}
 
+{# From: https://github.com/bitprophet/alabaster/blob/5f249677242be96601e034edb3697b7482a6abcf/alabaster/layout.html #}
+{# Nav should appear before content, not after #}
+{%- block content %}
+{%- if theme_fixed_sidebar|lower == 'true' %}
+  <div class="document">
+    {{ sidebar() }}
+    {%- block document %}
+      <div class="documentwrapper">
+      {%- if render_sidebar %}
+        <div class="bodywrapper">
+      {%- endif %}
+
+          {%- block relbar_top %}
+            {%- if theme_show_relbar_top|tobool %}
+              <div class="related top">
+                &nbsp;
+                {{- rellink_markup () }}
+              </div>
+            {%- endif %}
+          {% endblock %}
+
+          <div class="body" role="main">
+            <div style="display:block;position:relative; margin-bottom: 1em;">
+              <div style="display:block;width:100%;padding-top:12.5%;"></div>
+              <div class="rpad" data-unit="8x1" style="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;"></div>
+            </div>
+            {% block body %} {% endblock %}
+          </div>
+
+          {%- block relbar_bottom %}
+            {%- if theme_show_relbar_bottom|tobool %}
+              <div class="related bottom">
+                &nbsp;
+                {{- rellink_markup () }}
+              </div>
+            {%- endif %}
+          {% endblock %}
+
+      {%- if render_sidebar %}
+        </div>
+      {%- endif %}
+      </div>
+    {%- endblock %}
+    <div class="clearer"></div>
+  </div>
+{%- else %}
+{{ super() }}
+{%- endif %}
+{%- endblock %}
+
 {%- block footer %}
 <div class="footer">
   <div class="bodywrapper" style="display:block;position:relative;">
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index d5e1df3..a317165 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -4,27 +4,25 @@
   </a>
 </p>
 
+<p style="margin-left:auto; margin-right: auto;"><iframe src="https://ghbtns.com/github-btn.html?user=realpython&repo=python-guide&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe></p>
+
 <p>
   This opinionated guide exists to provide both novice and expert Python developers a best practice handbook to the installation, configuration, and usage of Python on a daily basis.
 </p>
 
-<iframe src="https://ghbtns.com/github-btn.html?user=realpython&repo=python-guide&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+<div style="display:block;position:relative;margin: 1em 0 1em 0;">
+  <div style="display:block;width:100%;padding-top:100%;"></div>
+  <div class="rpad" data-unit="1x1" style="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;"></div>
+</div>
 
 <h3>O'Reilly Book</h3>
 
 <p>This guide is now available in tangible book form!</p>
 
-<p><a href="/guide-book" target="_blank"><img style="max-width: 66%; text-align: center;" src="/_static/guide-book-cover.jpg" alt="Python Guide Book Cover"></a></p>
+<p><a href="/guide-book" target="_blank"><img style="max-width: 100%; text-align: center;" src="/_static/guide-book-cover.jpg" alt="Python Guide Book Cover"></a></p>
 
 <p>All proceeds are being directly donated to the <a href="https://djangogirls.org">DjangoGirls</a> organization.</p>
 
-<p>
-<div style="display:block;position:relative;">
-  <div style="display:block;width:100%;padding-top:100%;"></div>
-  <div class="rpad" data-unit="1x1" style="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;"></div>
-</div>
-</p>
-
 <h3>Contributors</h3>
 <p>
   This guide is the result of the collaboration of
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index ff01571..363663f 100644
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -4,27 +4,25 @@
   </a>
 </p>
 
+<p style="margin-left:auto; margin-right: auto;"><iframe src="https://ghbtns.com/github-btn.html?user=realpython&repo=python-guide&type=watch&count=true&size=large" allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe></p>
+
 <p>
   This opinionated guide exists to provide both novice and expert Python developers a best practice handbook to the installation, configuration, and usage of Python on a daily basis.
 </p>
 
-<iframe src="https://ghbtns.com/github-btn.html?user=realpython&repo=python-guide&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+<div style="display:block;position:relative;margin: 1em 0 1em 0;">
+  <div style="display:block;width:100%;padding-top:100%;"></div>
+  <div class="rpad" data-unit="1x1" style="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;"></div>
+</div>
 
 <h3>O'Reilly Book</h3>
 
 <p>This guide is now available in tangible book form!</p>
 
-<p><a href="/guide-book" target="_blank"><img style="max-width: 66%; text-align: center;" src="/_static/guide-book-cover.jpg" alt="Python Guide Book Cover"></a></p>
+<p><a href="/guide-book" target="_blank"><img style="max-width: 100%; text-align: center;" src="/_static/guide-book-cover.jpg" alt="Python Guide Book Cover"></a></p>
 
 <p>All proceeds are being directly donated to the <a href="https://djangogirls.org">DjangoGirls</a> organization.</p>
 
-<p>
-<div style="display:block;position:relative;">
-  <div style="display:block;width:100%;padding-top:100%;"></div>
-  <div class="rpad" data-unit="1x1" style="position:absolute;left:0;top:0;right:0;bottom:0;overflow:hidden;"></div>
-</div>
-</p>
-
 <h3>Translations</h3>
 <ul>
   <li><a href="https://docs.python-guide.org/">English</a></li>
diff --git a/docs/starting/which-python.rst b/docs/starting/which-python.rst
index 75970b3..85f3523 100644
--- a/docs/starting/which-python.rst
+++ b/docs/starting/which-python.rst
@@ -1,5 +1,5 @@
-Picking an Python Interpreter (3 vs. 2)
-=======================================
+Picking a Python Interpreter (3 vs 2)
+=====================================
 
 .. image:: /_static/photos/34484834733_5b80f65ab1_k_d.jpg