diff --git a/_includes/nav-components.html b/_includes/nav-components.html
index c60a1cd450..c5ced697d1 100644
--- a/_includes/nav-components.html
+++ b/_includes/nav-components.html
@@ -10,28 +10,28 @@
 <li>
   <a href="#btn-groups">Button groups</a>
   <ul class="nav">
-    <li><a href="#btn-groups-single">Basic button group</a></li>
+    <li><a href="#btn-groups-single">Basic example</a></li>
     <li><a href="#btn-groups-toolbar">Button toolbar</a></li>
-    <li><a href="#btn-groups-sizing">Button group sizing</a></li>
-    <li><a href="#btn-groups-nested">Nested button groups</a></li>
+    <li><a href="#btn-groups-sizing">Sizing</a></li>
+    <li><a href="#btn-groups-nested">Nesting</a></li>
     <li><a href="#btn-groups-vertical">Vertical variation</a></li>
-    <li><a href="#btn-groups-justified">Justified link buttons</a></li>
+    <li><a href="#btn-groups-justified">Justified link variation</a></li>
   </ul>
 </li>
 <li>
   <a href="#btn-dropdowns">Button dropdowns</a>
   <ul class="nav">
-    <li><a href="#btn-dropdowns-single">Single button dropdown</a></li>
-    <li><a href="#btn-dropdowns-split">Split button dropdown</a></li>
-    <li><a href="#btn-dropdowns-sizes">Button sizes</a></li>
+    <li><a href="#btn-dropdowns-single">Single button dropdowns</a></li>
+    <li><a href="#btn-dropdowns-split">Split button dropdowns</a></li>
+    <li><a href="#btn-dropdowns-sizing">Sizing</a></li>
     <li><a href="#btn-dropdowns-dropup">Dropup variation</a></li>
   </ul>
 </li>
 <li>
   <a href="#input-groups">Input groups</a>
   <ul class="nav">
-    <li><a href="#input-groups-basic">Basic input group</a></li>
-    <li><a href="#input-groups-sizes">Sizing options</a></li>
+    <li><a href="#input-groups-basic">Basic example</a></li>
+    <li><a href="#input-groups-sizing">Sizing</a></li>
     <li><a href="#input-groups-checkboxes-radios">Checkbox and radios addons</a></li>
     <li><a href="#input-groups-buttons">Button addons</a></li>
     <li><a href="#input-groups-buttons-dropdowns">Buttons with dropdowns</a></li>
@@ -41,8 +41,8 @@
 <li>
   <a href="#nav">Navs</a>
   <ul class="nav">
-    <li><a href="#nav-tabs">Tabs nav</a></li>
-    <li><a href="#nav-pills">Pills nav</a></li>
+    <li><a href="#nav-tabs">Tabs</a></li>
+    <li><a href="#nav-pills">Pills</a></li>
     <li><a href="#nav-justified">Justified nav</a></li>
     <li><a href="#nav-disabled-links">Disabled links</a></li>
     <li><a href="#nav-alignment">Alignment options</a></li>
@@ -53,13 +53,13 @@
   <a href="#navbar">Navbar</a>
   <ul class="nav">
     <li><a href="#navbar-default">Default navbar</a></li>
-    <li><a href="#navbar-buttons">Buttons in navbars</a></li>
-    <li><a href="#navbar-text">Text in navbars</a></li>
-    <li><a href="#navbar-links">Links in navbars</a></li>
+    <li><a href="#navbar-buttons">Buttons</a></li>
+    <li><a href="#navbar-text">Text</a></li>
+    <li><a href="#navbar-links">Non-nav links</a></li>
     <li><a href="#navbar-component-alignment">Component alignment</a></li>
-    <li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
-    <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
-    <li><a href="#navbar-static-top">Static top navbar</a></li>
+    <li><a href="#navbar-fixed-top">Fixed to top</a></li>
+    <li><a href="#navbar-fixed-bottom">Fixed to bottom</a></li>
+    <li><a href="#navbar-static-top">Static top</a></li>
     <li><a href="#navbar-inverted">Inverted navbar</a></li>
   </ul>
 </li>
@@ -78,7 +78,7 @@
 <li>
   <a href="#thumbnails">Thumbnails</a>
   <ul class="nav">
-    <li><a href="#thumbnails-default">Default thumbnails</a></li>
+    <li><a href="#thumbnails-default">Default example</a></li>
     <li><a href="#thumbnails-custom-content">Custom content</a></li>
   </ul>
 </li>
@@ -94,7 +94,7 @@
 <li>
   <a href="#progress">Progress bars</a>
   <ul class="nav">
-    <li><a href="#progress-basic">Basic progress bar</a></li>
+    <li><a href="#progress-basic">Basic example</a></li>
     <li><a href="#progress-alternatives">Contextual alternatives</a></li>
     <li><a href="#progress-striped">Striped</a></li>
     <li><a href="#progress-animated">Animated</a></li>
@@ -111,17 +111,16 @@
 <li>
   <a href="#list-group">List group</a>
   <ul class="nav">
-    <li><a href="#list-group-basic">Basic list group</a></li>
+    <li><a href="#list-group-basic">Basic example</a></li>
     <li><a href="#list-group-badges">Badges</a></li>
     <li><a href="#list-group-linked">Linked items</a></li>
     <li><a href="#list-group-custom-content">Custom content</a></li>
-    <!-- <li><a href="#list-group-pic">Leading picture</a></li> -->
   </ul>
 </li>
 <li>
   <a href="#panels">Panels</a>
   <ul class="nav">
-    <li><a href="#panels-basic">Basic panel</a></li>
+    <li><a href="#panels-basic">Basic example</a></li>
     <li><a href="#panels-heading">Panel with heading</a></li>
     <li><a href="#panels-alternatives">Contextual alternatives</a></li>
     <li><a href="#panels-list-group">With list groups</a>
diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index f5226ec5e6..4d2d58da33 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -4,9 +4,9 @@
     <li><a href="#overview-doctype">HTML5 doctype</a></li>
     <li><a href="#overview-mobile">Mobile first</a></li>
     <li><a href="#overview-responsive-images">Responsive images</a></li>
-    <li><a href="#overview-type-links">Type and links</a></li>
+    <li><a href="#overview-type-links">Typography and links</a></li>
     <li><a href="#overview-normalize">Normalize</a></li>
-    <li><a href="#overview-container">Container</a></li>
+    <li><a href="#overview-container">Containers</a></li>
   </ul>
 </li>
 <li>
@@ -16,13 +16,13 @@
   <a href="#grid">Grid system</a>
   <ul class="nav">
     <li><a href="#grid-media-queries">Media queries</a></li>
-    <li><a href="#grid-options">Available options</a></li>
+    <li><a href="#grid-options">Grid options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
-    <li><a href="#grid-example-mixed">Ex: Mobile-desktop</a></li>
-    <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktop</a></li>
+    <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
+    <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
     <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
-    <li><a href="#grid-offsetting">Offset columns</a></li>
-    <li><a href="#grid-nesting">Nested columns</a></li>
+    <li><a href="#grid-offsetting">Offsetting columns</a></li>
+    <li><a href="#grid-nesting">Nesting columns</a></li>
     <li><a href="#grid-column-ordering">Column ordering</a></li>
     <li><a href="#grid-less">LESS mixins and variables</a></li>
   </ul>
@@ -44,10 +44,10 @@
   <a href="#tables">Tables</a>
   <ul class="nav">
     <li><a href="#tables-example">Basic example</a></li>
-    <li><a href="#tables-striped">Zebra striping</a></li>
-    <li><a href="#tables-bordered">Bordered tables</a></li>
+    <li><a href="#tables-striped">Striped rows</a></li>
+    <li><a href="#tables-bordered">Bordered table</a></li>
     <li><a href="#tables-hover-rows">Hover rows</a></li>
-    <li><a href="#tables-condensed">Condensed tables</a></li>
+    <li><a href="#tables-condensed">Condensed table</a></li>
     <li><a href="#tables-contextual-classes">Contextual classes</a></li>
   </ul>
 </li>
@@ -55,10 +55,10 @@
   <a href="#forms">Forms</a>
   <ul class="nav">
     <li><a href="#forms-example">Basic example</a></li>
-    <li><a href="#forms-inline">Inline variation</a></li>
-    <li><a href="#forms-horizontal">Horizontal variation</a></li>
+    <li><a href="#forms-inline">Inline form</a></li>
+    <li><a href="#forms-horizontal">Horizontal form</a></li>
     <li><a href="#forms-controls">Supported controls</a></li>
-    <li><a href="#forms-controls-static">Static form control</a></li>
+    <li><a href="#forms-controls-static">Static control</a></li>
     <li><a href="#forms-control-states">Control states</a></li>
     <li><a href="#forms-control-sizes">Control sizing</a></li>
     <li><a href="#forms-help-text">Help text</a></li>
@@ -67,9 +67,9 @@
 <li>
   <a href="#buttons">Buttons</a>
   <ul class="nav">
-    <li><a href="#buttons-options">Button options</a></li>
+    <li><a href="#buttons-options">Options</a></li>
     <li><a href="#buttons-sizes">Sizes</a></li>
-    <li><a href="#buttons-disabled">Disabled</a></li>
+    <li><a href="#buttons-disabled">Disabled state</a></li>
     <li><a href="#buttons-tags">Button tags</a></li>
   </ul>
 </li>
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index fca38bde36..1cba756c35 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -1,7 +1,8 @@
 <li>
   <a href="#download">Download Bootstrap</a>
   <ul class="nav">
-    <li><a href="#download-options">Download options</a></li>
+    <li><a href="#download-source">Download source</a></li>
+    <li><a href="#download-additional">Additional downloads</a></li>
     <li><a href="#download-cdn">Bootstrap CDN</a></li>
   </ul>
 </li>
diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html
index 365fe1a103..e97027096c 100644
--- a/_includes/nav-javascript.html
+++ b/_includes/nav-javascript.html
@@ -4,7 +4,7 @@
     <li><a href="#js-individual-compiled">Individual or compiled</a></li>
     <li><a href="#js-data-attrs">Data attributes</a></li>
     <li><a href="#js-programmatic-api">Programmatic API</a></li>
-    <li><a href="#js-noconflict">No Conflict</a></li>
+    <li><a href="#js-noconflict">No conflict</a></li>
     <li><a href="#js-events">Events</a></li>
   </ul>
 </li>
diff --git a/assets/css/docs.css b/assets/css/docs.css
index 1a2c367f6d..61622751fe 100644
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -531,6 +531,12 @@ body {
   }
 }
 
+/* Pagination */
+.bs-example .pagination {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
 /* Example modals */
 .bs-example-modal {
   background-color: #f5f5f5;
diff --git a/components.html b/components.html
index a5bdb7c327..815bd5d89b 100644
--- a/components.html
+++ b/components.html
@@ -42,7 +42,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="dropdowns-alignment">Aligning the menus</h3>
+    <h3 id="dropdowns-alignment">Aligninment options</h3>
     <p>Add <code>.pull-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p>
 {% highlight html %}
 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel">
@@ -50,7 +50,7 @@ base_url: "../"
 </ul>
 {% endhighlight %}
 
-    <h3 id="dropdowns-headers">Dropdown headers</h3>
+    <h3 id="dropdowns-headers">Headers</h3>
     <p>Add a header to label sections of actions in any dropdown menu.</p>
     <div class="bs-example">
       <div class="dropdown clearfix">
@@ -76,7 +76,7 @@ base_url: "../"
 </ul>
 {% endhighlight %}
 
-    <h3 id="dropdowns-disabled">Disabled menu options</h3>
+    <h3 id="dropdowns-disabled">Disabled menu items</h3>
     <p>Add <code>.disabled</code> to a <code>&lt;li&gt;</code> in the dropdown to disable the link.</p>
     <div class="bs-example">
       <div class="dropdown clearfix">
@@ -112,7 +112,7 @@ base_url: "../"
       <p>When using tooltips or popovers on elements within a <code>.btn-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
     </div>
 
-    <h3 id="btn-groups-single">Basic button group</h3>
+    <h3 id="btn-groups-single">Basic example</h3>
     <p>Wrap a series of buttons with <code>.btn</code> in <code>.btn-group</code>.</p>
     <div class="bs-example">
       <div class="btn-group" style="margin: 9px 0 5px;">
@@ -129,7 +129,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-groups-toolbar">Multiple button groups</h3>
+    <h3 id="btn-groups-toolbar">Button toolbar</h3>
     <p>Combine sets of <code>&lt;div class="btn-group"&gt;</code> into a <code>&lt;div class="btn-toolbar"&gt;</code> for more complex components.</p>
     <div class="bs-example">
       <div class="btn-toolbar" style="margin: 0;">
@@ -157,7 +157,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-groups-sizing">Button group sizing</h3>
+    <h3 id="btn-groups-sizing">Sizing</h3>
     <p>Instead of applying button sizing classes to every button in a group, just add <code>.btn-group-*</code> to the <code>.btn-group</code>.</p>
     <div class="bs-example">
       <div class="btn-toolbar">
@@ -196,7 +196,7 @@ base_url: "../"
 <div class="btn-group btn-group-xs">...</div>
 {% endhighlight %}
 
-    <h3 id="btn-groups-nested">Nested button groups</h3>
+    <h3 id="btn-groups-nested">Nesting</h3>
     <p>Place a <code>.btn-group</code> within another <code>.btn-group</code> when you want dropdown menus mixed with a series of buttons.</p>
     <div class="bs-example">
       <div class="btn-group">
@@ -233,7 +233,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-groups-vertical">Vertical button groups</h3>
+    <h3 id="btn-groups-vertical">Vertical variation</h3>
     <p>Make a set of buttons appear vertically stacked rather than horizontally.</p>
     <div class="bs-example">
       <div class="btn-group-vertical">
@@ -289,7 +289,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-groups-justified">Justified button groups</h3>
+    <h3 id="btn-groups-justified">Justified link variation</h3>
     <p>Make a group of buttons stretch at the same size to span the entire width of its parent.</p>
 
     <div class="bs-callout bs-callout-warning">
@@ -494,7 +494,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-dropdowns-sizes">Works with all button sizes</h3>
+    <h3 id="btn-dropdowns-sizing">Sizing</h3>
     <p>Button dropdowns work with buttons of all sizes.</p>
     <div class="bs-example">
       <div class="btn-toolbar">
@@ -572,7 +572,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="btn-dropdowns-dropup">Dropup buttons</h3>
+    <h3 id="btn-dropdowns-dropup">Dropup variation</h3>
     <p>Trigger dropdown menus above elements by adding <code>.dropup</code> to the parent.</p>
     <div class="bs-example">
       <div class="btn-toolbar">
@@ -634,7 +634,7 @@ base_url: "../"
       <p>When using tooltips or popovers on elements within an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
     </div>
 
-    <h2 id="input-groups-basic">Basic input group</h2>
+    <h2 id="input-groups-basic">Basic example</h2>
     <form class="bs-example bs-example-form" role="form">
       <div class="input-group">
         <span class="input-group-addon">@</span>
@@ -670,7 +670,8 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h2 id="input-groups-sizes">Optional sizes</h2>
+
+    <h2 id="input-groups-sizing">Sizing</h2>
     <p>Add the relative form sizing classes to the <code>.input-group</code> itself and contents within will automatically resize—no need for repeating the form control size classes on each element.</p>
     <form class="bs-example bs-example-form" role="form">
       <div class="input-group input-group-lg">
@@ -706,7 +707,7 @@ base_url: "../"
 {% endhighlight %}
 
 
-    <h2 id="input-groups-checkboxes-radios">Checkboxes and radio buttons</h2>
+    <h2 id="input-groups-checkboxes-radios">Checkboxes and radio addons</h2>
     <p>Place any checkbox or radio option within an input group's addon instead of text.</p>
     <form class="bs-example bs-example-form">
       <div class="row">
@@ -750,7 +751,7 @@ base_url: "../"
 {% endhighlight %}
 
 
-    <h2 id="input-groups-buttons">Buttons instead of text</h2>
+    <h2 id="input-groups-buttons">Button addons</h2>
     <p>Buttons in input groups are a bit different and require one extra level of nesting. Instead of <code>.input-group-addon</code>, you'll need to use <code>.input-group-btn</code> to wrap the buttons. This is required due to default browser styles that cannot be overridden.</p>
     <form class="bs-example bs-example-form">
       <div class="row">
@@ -864,7 +865,7 @@ base_url: "../"
 </div><!-- /.row -->
 {% endhighlight %}
 
-    <h2 id="input-groups-buttons-segmented">Segmented dropdown groups</h2>
+    <h2 id="input-groups-buttons-segmented">Segmented buttons</h2>
     <form class="bs-example bs-example-form" role="form">
       <div class="row">
         <div class="col-lg-6">
@@ -981,9 +982,8 @@ base_url: "../"
 </ul>
 {% endhighlight %}
 
-    <h2>Options</h2>
 
-    <h3 id="nav-justified">Justified links</h3>
+    <h2 id="nav-justified">Justified</h2>
     <p>Easily make tabs or pills equal widths of their parent with <code>.nav-justified</code>.</p>
     <div class="bs-example">
       <ul class="nav nav-tabs nav-justified">
@@ -1007,7 +1007,8 @@ base_url: "../"
 </ul>
 {% endhighlight %}
 
-    <h3 id="nav-disabled-links">Disabled state</h3>
+
+    <h2 id="nav-disabled-links">Disabled links</h2>
     <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>.</p>
 
     <div class="bs-callout bs-callout-warning">
@@ -1031,14 +1032,11 @@ base_url: "../"
 {% endhighlight %}
 
 
-    <h3 id="nav-alignment">Component alignment</h3>
+    <h2 id="nav-alignment">Alignment options</h2>
     <p>To align nav links, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
 
 
-    <hr class="bs-docs-separator">
-
-
-    <h2 id="nav-dropdowns">Dropdowns</h2>
+    <h2 id="nav-dropdowns">Using dropdowns</h2>
     <p>Add dropdown menus with a little extra HTML and the <a href="../javascript/#dropdowns">dropdowns JavaScript plugin</a>.</p>
 
     <h3>Tabs with dropdowns</h3>
@@ -1244,10 +1242,7 @@ base_url: "../"
 </div>
 
 
-    <h2 id="navbar-optional-content">Optional navbar content</h2>
-    <p>Quickly add other types of content, beyond links or forms, to a navbar with a few classes.</p>
-
-    <h3 id="navbar-buttons">Buttons</h3>
+    <h2 id="navbar-buttons">Buttons</h2>
     <p>For buttons not residing in a <code>&lt;form&gt;</code>, add this class to vertically center buttons within a navbar.</p>
     <div class="bs-example">
       <nav class="navbar" role="navigation">
@@ -1269,7 +1264,8 @@ base_url: "../"
 <button type="button" class="btn btn-default navbar-btn">Sign in</button>
 {% endhighlight %}
 
-    <h3 id="navbar-text">Text in navbars</h3>
+
+    <h2 id="navbar-text">Text</h2>
     <p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
     <div class="bs-example">
       <nav class="navbar" role="navigation">
@@ -1291,7 +1287,8 @@ base_url: "../"
 <p class="navbar-text">Signed in as Mark Otto</p>
 {% endhighlight %}
 
-    <h3 id="navbar-links">Non-nav links</h3>
+
+    <h2 id="navbar-links">Non-nav links</h2>
     <p>For folks using standard links that are not within the regular navbar navigation component, use the <code>.navbar-link</code> class to add the proper colors for the default and inverse navbar options.</p>
     <div class="bs-example">
       <nav class="navbar" role="navigation">
@@ -1313,15 +1310,13 @@ base_url: "../"
 <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
 {% endhighlight %}
 
-    <h3 id="navbar-component-alignment">Component alignment</h3>
+
+    <h2 id="navbar-component-alignment">Component alignment</h2>
     <p>Align nav links, forms, buttons, or text, using the <code>.navbar-left</code> or <code>.navbar-right</code> utility classes. Both classes will add a CSS float in the specified direction. For example, to align nav links, put them in a separate <code>&lt;ul&gt;</code> with the respective utility class applied.</p>
     <p>These classes are mixin-ed versions of <code>.pull-left</code> and <code>.pull-right</code>, but they're scoped to media queries for easier handling of navbar components across device sizes.</p>
 
 
-    <h2>Optional display variations</h2>
-    <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>. These will also remove rounded corners.</p>
-
-    <h3 id="navbar-fixed-top">Fixed to top</h3>
+    <h2 id="navbar-fixed-top">Fixed to top</h2>
     <p>Add <code>.navbar-fixed-top</code>.</p>
     <div class="bs-example bs-navbar-top-example">
       <nav class="navbar navbar-fixed-top" role="navigation">
@@ -1361,7 +1356,8 @@ body { padding-top: 70px; }
       <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
     </div>
 
-    <h3 id="navbar-fixed-bottom">Fixed to bottom</h3>
+
+    <h2 id="navbar-fixed-bottom">Fixed to bottom</h2>
     <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
     <div class="bs-example bs-navbar-bottom-example">
       <nav class="navbar navbar-fixed-bottom" role="navigation">
@@ -1401,7 +1397,8 @@ body { padding-bottom: 70px; }
       <p>Make sure to include this <strong>after</strong> the core Bootstrap CSS.</p>
     </div>
 
-    <h3 id="navbar-static-top">Static top navbar</h3>
+
+    <h2 id="navbar-static-top">Static top</h2>
     <p>Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-*</code> classes, you do not need to change any padding on the <code>body</code>.</p>
     <div class="bs-example bs-navbar-top-example">
       <nav class="navbar navbar-static-top" role="navigation">
@@ -1433,7 +1430,7 @@ body { padding-bottom: 70px; }
 {% endhighlight %}
 
 
-    <h2 id="navbar-inverted">Inverted variation</h2>
+    <h2 id="navbar-inverted">Inverted navbar</h2>
     <p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p>
     <div class="bs-example">
       <nav class="navbar navbar-inverse" role="navigation">
@@ -1564,7 +1561,7 @@ body { padding-bottom: 70px; }
 {% endhighlight %}
 
 
-    <h3>Sizes</h3>
+    <h3>Sizing</h3>
     <p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code> for additional sizes.</p>
     <div class="bs-example">
       <div>
@@ -1821,7 +1818,7 @@ body { padding-bottom: 70px; }
     </div>
     <p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
-    <h3 id="thumbnails-default">Default thumbnails</h3>
+    <h3 id="thumbnails-default">Default example</h3>
     <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
     <div class="bs-example">
       <div class="row">
@@ -1858,7 +1855,7 @@ body { padding-bottom: 70px; }
 </div>
 {% endhighlight %}
 
-    <h3 id="thumbnails-custom-content">Custom content thumbnails</h3>
+    <h3 id="thumbnails-custom-content">Custom content</h3>
     <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
     <div class="bs-example">
       <div class="row">
@@ -2016,7 +2013,7 @@ body { padding-bottom: 70px; }
       <p>Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in Internet Explorer 9 and below or older versions of Firefox. Opera 12 does not support animations.</p>
     </div>
 
-    <h3 id="progress-basic">Basic</h3>
+    <h3 id="progress-basic">Basic example</h3>
     <p>Default progress bar with a vertical gradient.</p>
     <div class="bs-example">
       <div class="progress">
@@ -2265,8 +2262,6 @@ body { padding-bottom: 70px; }
 
 
 
-
-
   <!-- List group
   ================================================== -->
   <div class="bs-docs-section">
@@ -2275,7 +2270,7 @@ body { padding-bottom: 70px; }
     </div>
     <p class="lead">List groups are a flexible and powerful component for displaying not only simple lists of elements, but complex ones with custom content.</p>
 
-    <h3 id="list-group-basic">Basic list group</h3>
+    <h3 id="list-group-basic">Basic example</h3>
     <p>The most basic list group is simply an unordered list with list items, and the proper classes. Build upon it with the options that follow, or your own CSS as needed.</p>
     <div class="bs-example">
       <ul class="list-group">
@@ -2296,7 +2291,7 @@ body { padding-bottom: 70px; }
 </ul>
 {% endhighlight %}
 
-    <h3 id="list-group-badges">With badges</h3>
+    <h3 id="list-group-badges">Badges</h3>
     <p>Add the badges component to any list group item and it will automatically be positioned on the right.</p>
     <div class="bs-example">
       <ul class="list-group">
@@ -2323,7 +2318,7 @@ body { padding-bottom: 70px; }
 </ul>
 {% endhighlight %}
 
-    <h3 id="list-group-linked">Linked list group</h3>
+    <h3 id="list-group-linked">Linked items</h3>
     <p>Linkify list group items by using anchor tags instead of list items (that also means a parent <code>&lt;div&gt;</code> instead of an <code>&lt;ul&gt;</code>). No need for individual parents around each element.</p>
     <div class="bs-example">
       <div class="list-group">
@@ -2387,7 +2382,7 @@ body { padding-bottom: 70px; }
     </div>
     <p class="lead">While not always necessary, sometimes you need to put your DOM in a box. For those situations, try the panel component.</p>
 
-    <h3 id="panels-basic">Basic panel</h3>
+    <h3 id="panels-basic">Basic example</h3>
     <p>By default, all the <code>.panel</code> does is apply some basic border and padding to contain some content.</p>
     <div class="bs-example">
       <div class="panel">
diff --git a/css.html b/css.html
index 305d9f78ca..ad48dcb09e 100644
--- a/css.html
+++ b/css.html
@@ -15,7 +15,7 @@ base_url: "../"
     </div>
     <p class="lead">Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development.</p>
 
-    <h3 id="overview-doctype">HTML5 doctype required</h3>
+    <h3 id="overview-doctype">HTML5 doctype</h3>
     <p>Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.</p>
 {% highlight html %}
 <!DOCTYPE html>
@@ -51,10 +51,10 @@ base_url: "../"
     </ul>
     <p>These styles can be found within <code>scaffolding.less</code>.</p>
 
-    <h3 id="overview-normalize">Normalize reset</h3>
+    <h3 id="overview-normalize">Normalize</h3>
     <p>For improved cross-browser rendering, we use <a href="http://necolas.github.io/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
 
-    <h3 id="overview-container">Centering with container</h3>
+    <h3 id="overview-container">Containers</h3>
     <p>Easily center a page's contents by wrapping its contents in a <code>.container</code>. Containers set <code>max-width</code> at various media query breakpoints to match our grid system.</p>
 {% highlight html %}
 <div class="container">
@@ -249,7 +249,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="grid-example-mixed">Example: Combining mobile with desktop</h3>
+    <h3 id="grid-example-mixed">Example: Mobile and desktop</h3>
     <p>Don't want your columns to simply stack in smaller devices? Use the extra small and medium device grid classes by adding <code>.col-xs-*</code> <code>.col-md-*</code> to your columns. See the example below for a better idea of how it all works.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
@@ -287,7 +287,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="grid-example-mixed-complete">Example: Mobile, tablet, and desktop</h3>
+    <h3 id="grid-example-mixed-complete">Example: Mobile, tablet, desktops</h3>
     <p>Build on the previous example by creating even more dynamic and powerful layouts with tablet <code>.col-sm-*</code> classes.</p>
     <div class="bs-docs-grid">
       <div class="row show-grid">
@@ -1061,10 +1061,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h2>Optional classes</h2>
-    <p>Add any of the following classes to the <code>.table</code> base class.</p>
-
-    <h3 id="tables-striped">Striped</h3>
+    <h2 id="tables-striped">Striped rows</h2>
     <p>Use <code>.table-striped</code> to add zebra-striping to any table row within the <code>&lt;tbody&gt;</code>.</p>
     <div class="bs-callout bs-callout-danger">
       <h4>Cross-browser compatibility</h4>
@@ -1108,7 +1105,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 </table>
 {% endhighlight %}
 
-    <h3 id="tables-bordered">Bordered</h3>
+
+    <h2 id="tables-bordered">Bordered table</h2>
     <p>Add <code>.table-bordered</code> for borders on all sides of the table and cells.</p>
     <div class="bs-example">
       <table class="table table-bordered">
@@ -1152,7 +1150,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 </table>
 {% endhighlight %}
 
-    <h3 id="tables-hover-rows">Hover rows</h3>
+
+    <h2 id="tables-hover-rows">Hover rows</h2>
     <p>Add <code>.table-hover</code> to enable a hover state on table rows within a <code>&lt;tbody&gt;</code>.</p>
     <div class="bs-example">
       <table class="table table-hover">
@@ -1192,7 +1191,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h3 id="tables-condensed">Condensed</h3>
+    <h2 id="tables-condensed">Condensed table</h2>
     <p>Add <code>.table-condensed</code> to make tables more compact by cutting cell padding in half.</p>
     <div class="bs-example">
       <table class="table table-condensed">
@@ -1233,7 +1232,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
 
 
-    <h2 id="tables-contextual-classes">Contextual table classes</h2>
+    <h2 id="tables-contextual-classes">Contextual classes</h2>
     <p>Use contextual classes to color table rows or individual cells.</p>
     <div class="bs-table-scrollable">
       <table class="table table-bordered table-striped bs-table">
@@ -1406,7 +1405,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h3 id="forms-inline">Inline form</h3>
+    <h2 id="forms-inline">Inline form</h2>
     <p>Add <code>.form-inline</code> for left-aligned and inline-block controls for a compact layout.</p>
     <div class="bs-callout bs-callout-danger">
       <h4>Requires custom widths</h4>
@@ -1451,6 +1450,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 </form>
 {% endhighlight %}
 
+
     <h2 id="forms-horizontal">Horizontal form</h2>
     <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout by adding <code>.form-horizontal</code> to the form. Doing so changes <code>.form-group</code>s to behave as grid rows, so no need for <code>.row</code>.</p>
     <form class="bs-example form-horizontal">
@@ -1513,7 +1513,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h2 id="forms-controls">Supported form controls</h2>
+    <h2 id="forms-controls">Supported controls</h2>
     <p>Examples of standard form controls supported in an example form layout.</p>
 
     <h3>Inputs</h3>
@@ -1647,8 +1647,8 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h2 id="forms-controls-static">Static text in horizontal forms</h2>
-    <p>When you need to place regular, static text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
+    <h2 id="forms-controls-static">Static control</h2>
+    <p>When you need to place plain text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code>&lt;p&gt;</code>.</p>
     <form class="bs-example form-horizontal">
       <div class="form-group">
         <label class="col-lg-2 control-label">Email</label>
@@ -1681,7 +1681,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
-    <h2 id="forms-control-states">Form control states</h2>
+    <h2 id="forms-control-states">Form states</h2>
     <p>Provide feedback to users or visitors with basic feedback states on form controls and labels.</p>
 
     <h3 id="forms-input-focus">Input focus</h3>
@@ -1873,7 +1873,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <h1 id="buttons">Buttons</h1>
     </div>
 
-    <h2 id="buttons-options">Button options</h2>
+    <h2 id="buttons-options">Options</h2>
     <p>Use any of the available button classes to quickly create a styled button.</p>
     <div class="bs-example">
       <button type="button" class="btn btn-default">Default</button>
@@ -1907,7 +1907,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 <button type="button" class="btn btn-link">Link</button>
 {% endhighlight %}
 
-    <h2 id="buttons-sizes">Button sizes</h2>
+    <h2 id="buttons-sizes">Sizes</h2>
     <p>Fancy larger or smaller buttons? Add <code>.btn-lg</code>, <code>.btn-sm</code>, or <code>.btn-xs</code> for additional sizes.</p>
     <div class="bs-example">
       <p>
@@ -1997,7 +1997,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     </div>
 
 
-    <h2 id="buttons-tags">Using multiple tags</h2>
+    <h2 id="buttons-tags">Button tags</h2>
     <p>Use the button classes on an <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, or <code>&lt;input&gt;</code> element.</p>
     <form class="bs-example">
       <a class="btn btn-default" href="#">Link</a>
diff --git a/getting-started.html b/getting-started.html
index 0c5c67c252..d19055052b 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -15,7 +15,7 @@ base_url: "../"
     </div>
     <p class="lead">There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
 
-    <h3>Download latest full source</h3>
+    <h3 id="download-source">Download latest full source</h3>
     <p>Until Bootstrap 3.0.0 is finalized, download the latest full source code (includes compiled and minified versions of our CSS and JavaScript under the <code>dist/</code> directory).</p>
     <p><a class="btn btn-lg btn-primary" href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download latest Bootstrap 3</a></p>
     <!--
@@ -24,7 +24,7 @@ base_url: "../"
     <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a></p>
     -->
 
-    <h3 id="download-options">More download options</h3>
+    <h3 id="download-additional">Additional downloads</h3>
     <div class="bs-docs-dl-options">
       <h4>
         <a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download latest source code</a>
@@ -41,7 +41,7 @@ base_url: "../"
       {% highlight bash %}$ bower install bootstrap{% endhighlight %}
     </div>
 
-    <h3 id="download-cdn">Use the Bootstrap CDN</h3>
+    <h3 id="download-cdn">Bootstrap CDN</h3>
     <p>The folks over at <a href="https://www.netdna.com/">NetDNA</a> have graciously provided CDN support for Bootstrap's CSS and JavaScript. To use, swap your local instances for the <a href="http://www.bootstrapcdn.com/">Bootstrap CDN</a> links listed below.</p>
 {% highlight html linenos %}
 <!-- Latest compiled and minified CSS -->