diff --git a/docsite/_static/ansible-local.css b/docsite/_static/ansible-local.css
new file mode 100644
index 0000000000..5fb48d0498
--- /dev/null
+++ b/docsite/_static/ansible-local.css
@@ -0,0 +1,8 @@
+/* Local CSS tweaks for ansible */
+.dropdown-menu {
+    overflow-y: auto;
+}
+
+h2 {
+    padding-top: 40px;
+}
\ No newline at end of file
diff --git a/docsite/_themes/bootstrap/layout.html b/docsite/_themes/bootstrap/layout.html
index 1d377d48b8..30f8add71c 100644
--- a/docsite/_themes/bootstrap/layout.html
+++ b/docsite/_themes/bootstrap/layout.html
@@ -1,6 +1,6 @@
 {% extends "basic/layout.html" %}
 {% set script_files = script_files + ['_static/bootstrap-dropdown.js', '_static/bootstrap-scrollspy.js'] %}
-{% set css_files = ['_static/bootstrap.css', '_static/bootstrap-sphinx.css'] + css_files %}
+{% set css_files = ['_static/bootstrap.css', '_static/bootstrap-sphinx.css', '_static/ansible-local.css'] + css_files %}
 
 {# Sidebar: Rework into our Boostrap nav section. #}
 {% macro navBar() %}
@@ -97,6 +97,20 @@
 s.parentNode.insertBefore(ga, s);
  })();
 
+</script>
+<script type="text/javascript">
+// Set the maximum height of drop down menus to just less than the height
+// of the viewport.
+var set_max_menu_height = function () {
+
+  // set menu max height to 75 less than viewport height
+  $('.dropdown-menu').css('max-height', $(window).height() - 75); 
+}
+
+// Set this when we set the page up and on each resize.
+$(window).resize(set_max_menu_height);
+$(window).ready(set_max_menu_height);
+
 </script>
 
 {% endblock %}
diff --git a/docsite/_themes/bootstrap/localtoc.html b/docsite/_themes/bootstrap/localtoc.html
index 6f1bc8433f..d3014cf7fa 100644
--- a/docsite/_themes/bootstrap/localtoc.html
+++ b/docsite/_themes/bootstrap/localtoc.html
@@ -1,5 +1,5 @@
 <li class="dropdown" data-dropdown="dropdown">
   <a href="#"
-     class="dropdown-toggle">{{ _('Page') }}</a>
+     class="dropdown-toggle">{{ _('Section') }}</a>
   <span class="localtoc">{{ toc }}</span>
 </li>