diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 0d99d6ea9c..7fd15498e7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3034,6 +3034,26 @@ button.close {
   border-bottom: 1px solid #ffffff;
 }
 
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  content: " ";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
 /*
 // Prevent IE8 from misplacing imgs
 // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
@@ -3101,26 +3121,6 @@ button.close {
   border-color: @grayLight;
 }
 
-
-
-// Tabbable tabs
-// -------------------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
 */
 
 .navbar {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e35badfc9b..e1caaceb74 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -9,6 +9,7 @@
 -------------------------------------------------- */
 
 body {
+  padding-top: 54px;
   position: relative; /* For scrollyspy */
   /* We add the padding to the body for >768px only */
 }
@@ -310,6 +311,11 @@ section > ul li {
   margin-left: 20px;
 }
 
+/* Example tabbable tabs */
+.bs-docs-example-tabs .nav-tabs {
+  margin-bottom: 15px;
+}
+
 
 /* Example templates
 -------------------------------------------------- */
diff --git a/docs/index.html b/docs/index.html
index 6cb633709e..68a14ae2ef 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -24,7 +24,7 @@ title: Bootstrap
 
 <div class="container">
 
-  <div class="marketing">
+  <div class="bs-docs-marketing">
 
     <h1>Introducing Bootstrap.</h1>
     <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
diff --git a/docs/javascript.html b/docs/javascript.html
index 875563f505..3194ce8bcf 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -622,7 +622,7 @@ $('[data-spy="scroll"]').each(function () {
 
           <h2>Example tabs</h2>
           <p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
-          <div class="bs-docs-example">
+          <div class="bs-docs-example bs-docs-example-tabs">
             <ul id="myTab" class="nav nav-tabs">
               <li class="active"><a href="#home" data-toggle="tab">Home</a></li>
               <li><a href="#profile" data-toggle="tab">Profile</a></li>
diff --git a/less/navs.less b/less/navs.less
index 6eb12d76b4..24837cb7c5 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -186,6 +186,26 @@
 
 
 
+// Tabbable tabs
+// -------------------------
+
+// Clear any floats
+.tabbable {
+  .clearfix();
+}
+
+// Show/hide tabbable areas
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+
+
 /*
 // Prevent IE8 from misplacing imgs
 // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
@@ -253,24 +273,4 @@
   border-color: @grayLight;
 }
 
-
-
-// Tabbable tabs
-// -------------------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
 */