diff --git a/public/css/vroom.css b/public/css/vroom.css
index 3e9b3c4..961f801 100644
--- a/public/css/vroom.css
+++ b/public/css/vroom.css
@@ -276,6 +276,9 @@ a.popup>span {
 .header-btn-group {
   margin-left: 10px;
 }
+.toc {
+  overflow-y: auto;
+}
 html {
   height: 100%;
 }
diff --git a/public/js/vroom.js b/public/js/vroom.js
index 999f3f9..8d063f4 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -431,6 +431,7 @@ function initIndex(){
 function initDoc(){
 
   $('#toc').width($('#toc').parents().width());
+  $('#toc').css('height', maxHeight() - 100 + 'px');
 
   $('#toc').toc({
     elementClass: 'toc',
diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep
index 73f9f96..0f370d5 100644
--- a/templates/default/public_toolbar.html.ep
+++ b/templates/default/public_toolbar.html.ep
@@ -6,7 +6,7 @@
     <% } %>
     <div class="container-fluid">
       <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#toolBar">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#toolbar">
           <span class="sr-only"></span>
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
@@ -14,7 +14,7 @@
         </button>
         <img id="navBarLogo" src="<%= $self->get_url('/') %>img/logo_vroom_alpha.png" class="hidden-xs"/>
       </div>
-      <div class="collapse navbar-collapse" id="toolBar">
+      <div class="collapse navbar-collapse" id="toolbar">
         <ul class="nav navbar-nav navbar-right">
           <li>
             <a href="<%= $self->get_url('/') %>"><%=l 'HOME' %></a>