diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index fd0a71edb9..640dc5cfb7 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -39,6 +39,31 @@ li {
 
 
 
+/* Tweak navbar brand link to be super sleek
+-------------------------------------------------- */
+
+.navbar,
+.subnav {
+  font-size: 13px;
+}
+.navbar-fixed-top .brand {
+  padding-right: 0;
+  padding-left: 0;
+  margin-left: 20px;
+  float: right;
+  font-weight: bold;
+  color: #000;
+  text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
+  -webkit-transition: all .2s linear;
+     -moz-transition: all .2s linear;
+          transition: all .2s linear;
+}
+.navbar-fixed-top .brand:hover {
+  text-decoration: none;
+}
+
+
+
 /* Left nav
 -------------------------------------------------- */
 
@@ -150,6 +175,7 @@ hr.soften {
 ------------------------- */
 .jumbotron {
   position: relative;
+  text-align: center;
 }
 .jumbotron h1 {
   margin-bottom: 10px;
@@ -159,7 +185,6 @@ hr.soften {
   line-height: 1;
 }
 .jumbotron p {
-  max-width: 780px;
   margin-bottom: 20px;
   font-weight: 300;
 }
@@ -179,7 +204,8 @@ hr.soften {
 /* Masthead (docs home)
 ------------------------- */
 .masthead {
-  margin-bottom: 60px;
+  margin-top: 20px;
+  margin-bottom: 80px;
 }
 .masthead h1,
 .masthead p {
@@ -226,11 +252,14 @@ hr.soften {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
+  text-align: left;
 }
 .subhead h1 {
   font-size: 60px;
 }
 .subhead .lead {
+  max-width: 780px;
+  margin-bottom: 30px;
   line-height: 25px;
 }
 
@@ -340,6 +369,7 @@ hr.soften {
   margin: 36px 0 27px;
   font-size: 40px;
   font-weight: 300;
+  text-align: center;
 }
 .marketing h2,
 .marketing h3 {
@@ -366,6 +396,7 @@ hr.soften {
   font-weight: 300;
   line-height: 24px;
   color: #999;
+  text-align: center;
 }
 
 
@@ -600,6 +631,9 @@ h2 + .row {
 }
 
 /* Example sites showcase */
+.example-sites {
+  margin-left: 20px;
+}
 .example-sites img {
   max-width: 100%;
   margin: 0 auto;
diff --git a/docs/base-css.html b/docs/base-css.html
index 56756b81ff..e012f2741c 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -158,6 +158,16 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#typography">Typography</a></li>
+      <li><a href="#code">Code</a></li>
+      <li><a href="#tables">Tables</a></li>
+      <li><a href="#forms">Forms</a></li>
+      <li><a href="#buttons">Buttons</a></li>
+      <li><a href="#icons">Icons by Glyphicons</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/components.html b/docs/components.html
index 8716963bdf..afd8d60f46 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -158,6 +158,33 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a href="#buttonGroups">Button groups</a></li>
+          <li><a href="#buttonDropdowns">Button dropdowns</a></li>
+        </ul>
+      </li>
+      <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Navigation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a href="#navs">Nav, tabs, pills</a></li>
+          <li><a href="#navbar">Navbar</a></li>
+          <li><a href="#breadcrumbs">Breadcrumbs</a></li>
+          <li><a href="#pagination">Pagination</a></li>
+        </ul>
+      </li>
+      <li><a href="#labels">Labels</a></li>
+      <li><a href="#badges">Badges</a></li>
+      <li><a href="#typography">Typography</a></li>
+      <li><a href="#thumbnails">Thumbnails</a></li>
+      <li><a href="#alerts">Alerts</a></li>
+      <li><a href="#progress">Progress bars</a></li>
+      <li><a href="#misc">Miscellaneous</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/download.html b/docs/download.html
index ebba8fa8f8..b8c3387938 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="active">
@@ -158,22 +158,18 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Customize and download</h1>
   <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#components">1. Choose components</a></li>
+      <li><a href="#plugins">2. Select jQuery plugins</a></li>
+      <li><a href="#variables">3. Customize variables</a></li>
+      <li><a href="#download">4. Download</a></li>
+    </ul>
+  </div>
 </header>
 
 
 
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>Contents</h3>
-    <ol>
-      <li><a href="#components">Choose components</a></li>
-      <li><a href="#plugins">Select jQuery plugins</a></li>
-      <li><a href="#variables">Customize variables</a></li>
-      <li><a href="#download">Download</a></li>
-    </ol>
-  </div>
-</section>
-
 <form>
   <section class="download" id="components">
     <div class="page-header">
diff --git a/docs/examples.html b/docs/examples.html
index 06844c6cdc..24e9b7de19 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
diff --git a/docs/index.html b/docs/index.html
index 9f36d3bc9f..f498907b8f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="active">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -196,7 +196,7 @@
   <h1>Designed for everyone, everywhere.</h1>
   <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
   <div class="row">
-    <div class="span4">
+    <div class="span5">
       <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
       <h2>Built for and by nerds</h2>
       <p>We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.</p>
@@ -213,7 +213,7 @@
       <h2>Responsive design</h2>
       <p>As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
     </div>
-    <div class="span4">
+    <div class="span5">
       <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
       <h2>Styleguide docs</h2>
       <p>Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.</p>
@@ -237,27 +237,27 @@
   <h1>Built with Bootstrap.</h1>
   <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
   <ul class="thumbnails example-sites">
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://soundready.fm/" target="_blank">
         <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
       </a>
     </li>
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://kippt.com/" target="_blank">
         <img src="assets/img/example-sites/kippt.png" alt="Kippt">
       </a>
     </li>
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
         <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
       </a>
     </li>
-    <li class="span2">
+<!--     <li class="span2">
       <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
         <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
       </a>
     </li>
-  </ul>
+ -->  </ul>
 
 </div><!-- /.marketing -->
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 991ce7b2b0..cd13210889 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="active">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -158,6 +158,22 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Javascript for Bootstrap</h1>
   <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#javascript">All plugins</a></li>
+      <li><a href="#modals">Modal</a></li>
+      <li><a href="#dropdowns">Dropdown</a></li>
+      <li><a href="#scrollspy">Scrollspy</a></li>
+      <li><a href="#tabs">Tab</a></li>
+      <li><a href="#tooltips">Tooltip</a></li>
+      <li><a href="#popovers">Popover</a></li>
+      <li><a href="#alerts">Alert</a></li>
+      <li><a href="#buttons">Button</a></li>
+      <li><a href="#collapse">Collapse</a></li>
+      <li><a href="#carousel">Carousel</a></li>
+      <li><a href="#typeahead">Typeahead</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/less.html b/docs/less.html
index 775b02afe3..6ba90e59f1 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="active">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -158,21 +158,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Using LESS with Bootstrap</h1>
   <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
-</header>
-
-
-
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>Contents</h3>
-    <ol>
+  <div class="subnav">
+    <ul class="nav nav-pills">
       <li><a href="#builtWith">Built with Less</a></li>
       <li><a href="#variables">Variables</a></li>
       <li><a href="#mixins">Mixins</a></li>
       <li><a href="#compiling">Compiling Bootstrap</a></li>
-    </ol>
+    </ul>
   </div>
-</section>
+</header>
 
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 257cbc5648..299eec8277 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="active">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">
@@ -158,6 +158,16 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#global">Global styles</a></li>
+      <li><a href="#gridSystem">Grid system</a></li>
+      <li><a href="#fluidGridSystem">Fluid grid system</a></li>
+      <li><a href="#gridCustomization">Customizing</a></li>
+      <li><a href="#layouts">Layouts</a></li>
+      <li><a href="#responsive">Responsive design</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 779e106636..f488780143 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -45,7 +45,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -55,7 +55,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="{{index}}">
-                <a href="./index.html">{{_i}}Overview{{/i}}</a>
+                <a href="./index.html">{{_i}}Home{{/i}}</a>
               </li>
               <li class="{{scaffolding}}">
                 <a href="./scaffolding.html">{{_i}}Scaffolding{{/i}}</a>
@@ -67,10 +67,10 @@
                 <a href="./components.html">{{_i}}Components{{/i}}</a>
               </li>
               <li class="{{javascript}}">
-                <a href="./javascript.html">{{_i}}Javascript plugins{{/i}}</a>
+                <a href="./javascript.html">{{_i}}Javascript{{/i}}</a>
               </li>
               <li class="{{less}}">
-                <a href="./less.html">{{_i}}Using LESS{{/i}}</a>
+                <a href="./less.html">{{_i}}LESS{{/i}}</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="{{download}}">
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 1f0546657c..9010bef7a0 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -3,6 +3,16 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Base CSS{{/i}}</h1>
   <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
+      <li><a href="#code">{{_i}}Code{{/i}}</a></li>
+      <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
+      <li><a href="#forms">{{_i}}Forms{{/i}}</a></li>
+      <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li>
+      <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d05eacf534..acdae3d925 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -3,6 +3,33 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Components{{/i}}</h1>
   <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
+          <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
+        </ul>
+      </li>
+      <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Navigation{{/i}} <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
+          <li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li>
+          <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
+          <li><a href="#pagination">{{_i}}Pagination{{/i}}</a></li>
+        </ul>
+      </li>
+      <li><a href="#labels">{{_i}}Labels{{/i}}</a></li>
+      <li><a href="#badges">{{_i}}Badges{{/i}}</a></li>
+      <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
+      <li><a href="#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
+      <li><a href="#alerts">{{_i}}Alerts{{/i}}</a></li>
+      <li><a href="#progress">{{_i}}Progress bars{{/i}}</a></li>
+      <li><a href="#misc">{{_i}}Miscellaneous{{/i}}</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 03fbe3775c..a01c14ab7a 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -3,22 +3,18 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Customize and download{{/i}}</h1>
   <p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
+      <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
+      <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
+      <li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
+    </ul>
+  </div>
 </header>
 
 
 
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>{{_i}}Contents{{/i}}</h3>
-    <ol>
-      <li><a href="#components">{{_i}}Choose components{{/i}}</a></li>
-      <li><a href="#plugins">{{_i}}Select jQuery plugins{{/i}}</a></li>
-      <li><a href="#variables">{{_i}}Customize variables{{/i}}</a></li>
-      <li><a href="#download">{{_i}}Download{{/i}}</a></li>
-    </ol>
-  </div>
-</section>
-
 <form>
   <section class="download" id="components">
     <div class="page-header">
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index bee3fc19c2..fe7a02717e 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -41,7 +41,7 @@
   <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
   <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
   <div class="row">
-    <div class="span4">
+    <div class="span5">
       <img class="bs-icon" src="assets/img/glyphicons/glyphicons_042_group.png">
       <h2>{{_i}}Built for and by nerds{{/i}}</h2>
       <p>{{_i}}We love building awesome products on the web just like you, so we made Bootstrap. No matter your skill level, use it as a complete kit or use to start something more complex.{{/i}}</p>
@@ -58,7 +58,7 @@
       <h2>{{_i}}Responsive design{{/i}}</h2>
       <p>{{_i}}As of Bootstrap 2, our components are scaled according to a range of resolutions and devices to provide a consistent experience, no matter what.{{/i}}</p>
     </div>
-    <div class="span4">
+    <div class="span5">
       <img class="bs-icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
       <h2>{{_i}}Styleguide docs{{/i}}</h2>
       <p>{{_i}}Unlike other front-end toolkits, Bootstrap was designed first and foremost as a styleguide to document not only our features, but best practices and living, coded examples.{{/i}}</p>
@@ -82,26 +82,26 @@
   <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
   <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
   <ul class="thumbnails example-sites">
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://soundready.fm/" target="_blank">
         <img src="assets/img/example-sites/soundready.png" alt="SoundReady.fm">
       </a>
     </li>
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://kippt.com/" target="_blank">
         <img src="assets/img/example-sites/kippt.png" alt="Kippt">
       </a>
     </li>
-    <li class="span2">
+    <li class="span3">
       <a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
         <img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
       </a>
     </li>
-    <li class="span2">
+<!--     <li class="span2">
       <a class="thumbnail" href="http://www.jshint.com/" target="_blank">
         <img src="assets/img/example-sites/jshint.png" alt="JS Hint">
       </a>
     </li>
-  </ul>
+ -->  </ul>
 
 </div><!-- /.marketing -->
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 30872b1e1a..f4eb8969bc 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -3,6 +3,22 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#javascript">{{_i}}All plugins{{/i}}</a></li>
+      <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
+      <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
+      <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
+      <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
+      <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
+      <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
+      <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
+      <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
+      <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
+      <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
+      <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index fe33cd2472..6606f4ca83 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -3,21 +3,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p>
-</header>
-
-
-
-<section id="contents">
-  <div class="bs-docs-contents">
-    <h3>{{_i}}Contents{{/i}}</h3>
-    <ol>
+  <div class="subnav">
+    <ul class="nav nav-pills">
       <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
       <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
       <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
       <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
-    </ol>
+    </ul>
   </div>
-</section>
+</header>
 
 
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 3ccc87a2b6..850654aa3c 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -3,6 +3,16 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Scaffolding{{/i}}</h1>
   <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
+      <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
+      <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
+      <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
+      <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
+      <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
+    </ul>
+  </div>
 </header>
 
 
diff --git a/docs/upgrading.html b/docs/upgrading.html
index eccb685a48..8d388f4273 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -33,7 +33,7 @@
     ================================================== -->
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
-        <div class="container">
+        <div class="bs-docs-container">
           <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
@@ -43,7 +43,7 @@
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
-                <a href="./index.html">Overview</a>
+                <a href="./index.html">Home</a>
               </li>
               <li class="">
                 <a href="./scaffolding.html">Scaffolding</a>
@@ -55,10 +55,10 @@
                 <a href="./components.html">Components</a>
               </li>
               <li class="">
-                <a href="./javascript.html">Javascript plugins</a>
+                <a href="./javascript.html">Javascript</a>
               </li>
               <li class="">
-                <a href="./less.html">Using LESS</a>
+                <a href="./less.html">LESS</a>
               </li>
               <li class="divider-vertical"></li>
               <li class="">