diff --git a/static/css/base.css b/static/css/base.css
index 14032f4e..0e90f8bd 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -1,3 +1,6 @@
+.navbar-collapse {
+    overflow-x: hidden;
+}
 /* For the footer to be at the bottom*/
 body {
     padding-top: 50px;
@@ -84,11 +87,15 @@ a > i.fa {
         position: fixed;
         top:50px;
         right:0;
+        overflow-y: auto;
+        bottom:0px;
     }
     .sidenav-left {
         position: fixed;
         top:50px;
         left:0;
+        overflow-y: auto;
+        bottom:0px;
     }
     .dropdown-menu .dropdown-toggle:after {
         border-top: .3em solid transparent;
diff --git a/templates/base.html b/templates/base.html
index d8a2f87b..74d1bb29 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,11 +85,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% block sidebar %}
                 {% endblock %}
             </div>
-            <div class="col-sm-offset-2 col-sm-10 text-left pt4">
+            <div class="col-sm-offset-2 col-sm-10 col-lg-8 text-left pt4">
                 {# Display django.contrib.messages as Bootstrap alerts #}
                 {% bootstrap_messages %}
                 {% block content %}{% endblock %}
             </div>
+            <div class="col-lg-2 pt4">
+            </div>
         </div>
     </div>