diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index dfe1271648..4b0b59618e 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -34,8 +34,8 @@
     })
 
     // add tipsies to grid for scaffolding
-    if ($('#gridSystem').length) {
-      $('#gridSystem').tooltip({
+    if ($('#grid-system').length) {
+      $('#grid-system').tooltip({
           selector: '.show-grid > [class*="span"]'
         , title: function () { return $(this).width() + 'px' }
       })
diff --git a/docs/components.html b/docs/components.html
index b80eb6e714..c30699dc5d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1380,7 +1380,7 @@ title: Components
           <div class="page-header">
             <h1>Thumbnails</h1>
           </div>
-          <p class="lead">Extend Bootstrap's <a href="./css.html#gridSystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+          <p class="lead">Extend Bootstrap's <a href="./css/#gridsystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
           <h3>Default thumbnails</h3>
           <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
diff --git a/docs/css.html b/docs/css.html
index 297b4ea336..a295ae244c 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -23,7 +23,7 @@ title: CSS
           <li><a href="#global"><i class="glyphicon glyphicon-chevron-right"></i> Global settings</a></li>
           <li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
           <li><a href="#code"><i class="glyphicon glyphicon-chevron-right"></i> Code</a></li>
-          <li><a href="#gridSystem"><i class="glyphicon glyphicon-chevron-right"></i> Grid system</a></li>
+          <li><a href="#grid-system"><i class="glyphicon glyphicon-chevron-right"></i> Grid system</a></li>
           <li><a href="#tables"><i class="glyphicon glyphicon-chevron-right"></i> Tables</a></li>
           <li><a href="#forms"><i class="glyphicon glyphicon-chevron-right"></i> Forms</a></li>
           <li><a href="#buttons"><i class="glyphicon glyphicon-chevron-right"></i> Buttons</a></li>
@@ -440,7 +440,7 @@ title: CSS
 
         <!-- Grid system
         ================================================== -->
-        <section id="gridSystem">
+        <section id="grid-system">
           <div class="page-header">
             <h1>Grid system</h1>
           </div>
diff --git a/docs/index.html b/docs/index.html
index fda3442645..6cb633709e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -43,12 +43,12 @@ title: Bootstrap
       <div class="span4">
         <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
         <h2>Packed with features.</h2>
-        <p>A 12-column responsive <a href="./scaffolding.html#gridSystem">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p>
+        <p>A 12-column responsive <a href="./css/#grid-system">grid</a>, dozens of components, <a href="./javascript/">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize/">web-based Customizer</a> to make Bootstrap your own.</p>
       </div>
     </div>
 
     <h1>Built with Bootstrap.</h1>
-    <p class="marketing-byline">For more sites built with Bootstrap, <a href="./gallery.html">visit the gallery</a> or <a href="./getting-started.html#examples">browse the examples</a>.</p>
+    <p class="marketing-byline">For more sites built with Bootstrap, <a href="./gallery/">visit the gallery</a> or <a href="./getting-started/#examples">browse the examples</a>.</p>
     <div class="row bs-docs-gallery">
       <div class="span3">
         <a class="thumbnail" href="http://delicious.com">