diff --git a/assets/bootstrap.zip b/assets/bootstrap.zip
index 283e1c8e..46b148b3 100644
Binary files a/assets/bootstrap.zip and b/assets/bootstrap.zip differ
diff --git a/examples/carousel.html b/examples/carousel.html
index ed7740a9..0958103f 100644
--- a/examples/carousel.html
+++ b/examples/carousel.html
@@ -78,7 +78,7 @@
 
     .carousel .container {
       position: relative;
-      z-index: 10;
+      z-index: 9;
     }
 
     .carousel-control {
diff --git a/javascript.html b/javascript.html
index 49903a0b..79dedd18 100644
--- a/javascript.html
+++ b/javascript.html
@@ -146,6 +146,7 @@ $("#myModal").modal('show')                // initializes and invokes show immed
 
           <h3>No Conflict</h3>
           <p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances,  namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p>
+
 <pre class="prettyprint linenums">
 var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
 $.fn.bootstrapBtn = bootstrapButton            // give $().bootstrapBtn the bootstrap functionality
@@ -447,7 +448,7 @@ $('#myModal').on('hidden', function () {
                 </div>
               </div>
             </div> <!-- /navbar-example -->
-          </div>
+          </div> 
 
           <h3>Within tabs</h3>
           <div class="bs-docs-example">
@@ -484,7 +485,7 @@ $('#myModal').on('hidden', function () {
                 </ul>
               </li>
             </ul> <!-- /tabs -->
-          </div>
+          </div> 
 
 
           <hr class="bs-docs-separator">
diff --git a/templates/pages/javascript.mustache b/templates/pages/javascript.mustache
index 2f0c056c..e6b3f812 100644
--- a/templates/pages/javascript.mustache
+++ b/templates/pages/javascript.mustache
@@ -65,6 +65,7 @@ $("#myModal").modal('show')                // initializes and invokes show immed
 
           <h3>{{_i}}No Conflict{{/i}}</h3>
           <p>{{_i}}Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances,  namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.{{/i}}</p>
+
 <pre class="prettyprint linenums">
 var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
 $.fn.bootstrapBtn = bootstrapButton            // give $().bootstrapBtn the bootstrap functionality