diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 0df4cbe..47a6b87 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -46,10 +46,9 @@ class="notebook_app"
 
 <div id="menubar-container" class="container">
 <div id="menubar">
-<div class="navbar">
-  <div class="navbar-inner">
-    <div class="container">
-    <ul id="menus" class="nav nav-pills">
+    <div id="menus" class="navbar navbar-default" role="navigation">
+        <div class="container-fluid">
+            <ul class="nav navbar-nav">
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
             <ul id="file_menu" class="dropdown-menu">
                 <li id="new_notebook"
@@ -255,6 +254,10 @@ class="notebook_app"
             </ul>
         </li>
     </ul>
+        </div>
+    </div>
+
+    <!-- float to the right of the menu bar -->
     <div id="kernel_indicator" class="indicator_area pull-right">
        <i id="kernel_indicator_icon"></i>
     </div>
@@ -262,9 +265,6 @@ class="notebook_app"
        <i id="modal_indicator_icon"></i>
     </div>
     <div id="notification_area"></div>
-    </div>
-  </div>
-</div>
 </div>
 <div id="maintoolbar" class="navbar">
   <div class="toolbar-inner navbar-inner navbar-nobg">