diff --git a/dist/_data/data.json b/dist/_data/data.json
index 639150d..9d6a47c 100644
--- a/dist/_data/data.json
+++ b/dist/_data/data.json
@@ -3,6 +3,7 @@
 	"heading" : "Page Header",
 	"subheading" : "Subtext For Header",
 	"text" : "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+	"placeholder" : "Placeholder Text",
 	"url" : "#",
 	"cta" : "Call To Action",
 	"ariaLabel" : "Aria label",
@@ -13,7 +14,13 @@
 	"badge" : "23",
 	"label" : "New Label",
 	"labelClass" : "label-default",
-	"progressLabelClass" : "sr-only",
+	"progressBarClass" : "",
+	"progressCompleteText" : "60% Complete",
+	"progressMinWidth" : false,
+	"removeProgressText" : true,
+	"ariaMin" : 0,
+	"ariaMax" : 100,
+	"ariaNow" : 60,
 	"src" : "../../images/bootstrapthumb.jpg",
 	"alt" : "Bootstrap Thumbnail",
 	"caption" : "Caption Text",
@@ -69,6 +76,7 @@
 		}	
 	],
 	"caret" : "caret",
+	"dropdownClass" : "dropdown",
 	"dropdownList" : [
 		{ 
 			"url" : "#",
@@ -154,5 +162,86 @@
 		{ "text" : "Porta ac consectetur ac" },
 		{ "text" : "Vestibulum at eros" }
 	],
-	"navbarClass" : "navbar-default"
+	"navbarBrandText" : "Pattern Lab",
+	"navbarNavClass" : "",
+	"navbarNavFirst" : true,
+	"navbarNavLast" : {
+		"navbarNavClass" : "navbar-right"
+	},
+	"navbarNav" : [
+		{
+			"url" : "#",
+			"text" : "Link"
+		},
+		{
+			"url" : "#",
+			"text" : "Link"
+		},
+		{
+			"url" : "#",
+			"text" : "Dropdown",
+			"hasDropdown" : true,
+			"dropdownMenu" : [
+				{ 
+					"url" : "#",
+					"text" : "Action"	 
+				},
+				{ 
+					"url" : "#",
+					"text" : "Another action" 
+				},
+				{ 
+					"url" : "#",
+					"text" : "Something else here"
+				},
+				{ 
+					"separator" : "true"
+				},
+				{ 
+					"url" : "#",
+					"text" : "Link 4" 
+				}
+				
+			]
+		}
+	],
+	"navbarFormClass" : "navbar-left",
+	"navbarClass" : "navbar-default",
+	"mediaList" : [
+		{
+			"mediaLeft" : true,
+			"mediaRight" : false,
+			"nestedMedia" : [
+				{
+					"mediaLeft" : false,
+					"mediaRight" : true
+				},
+				{
+					"mediaLeft" : true,
+					"mediaRight" : false
+				}
+			]
+			
+		},
+		{
+			"heading" : "Item 2",
+			"text" : "This is the second item that is not nested.",
+			"mediaLeft" : true,
+			"mediaRight" : false,
+			"nestedMedia" : [
+				{
+					"heading" : "Nested Item 1",
+					"text" : "This is the first nested item of the list.",
+					"mediaLeft" : true,
+					"mediaRight" : false
+				},
+				{
+					"heading" : "Nested Item 2",
+					"text" : "This is the second nested item of the list",
+					"mediaLeft" : false,
+					"mediaRight" : true
+				}
+			]	
+		}
+	]
 }
\ No newline at end of file
diff --git a/dist/_patterns/00-atoms/05-forms/00-input.md b/dist/_patterns/00-atoms/04-forms/00-input.md
similarity index 100%
rename from dist/_patterns/00-atoms/05-forms/00-input.md
rename to dist/_patterns/00-atoms/04-forms/00-input.md
diff --git a/dist/_patterns/00-atoms/04-forms/00-input.mustache b/dist/_patterns/00-atoms/04-forms/00-input.mustache
new file mode 100755
index 0000000..a4c0cd5
--- /dev/null
+++ b/dist/_patterns/00-atoms/04-forms/00-input.mustache
@@ -0,0 +1,5 @@
+<input type="text" class="form-control" placeholder="{{ placeholder }}" aria-describedby="basic-addon1">
+
+
+
+
diff --git a/dist/_patterns/00-atoms/06-buttons/00-button.md b/dist/_patterns/00-atoms/05-buttons/00-button.md
similarity index 100%
rename from dist/_patterns/00-atoms/06-buttons/00-button.md
rename to dist/_patterns/00-atoms/05-buttons/00-button.md
diff --git a/dist/_patterns/00-atoms/06-buttons/00-button.mustache b/dist/_patterns/00-atoms/05-buttons/00-button.mustache
similarity index 100%
rename from dist/_patterns/00-atoms/06-buttons/00-button.mustache
rename to dist/_patterns/00-atoms/05-buttons/00-button.mustache
diff --git a/dist/_patterns/00-atoms/05-forms/00-input.mustache b/dist/_patterns/00-atoms/05-forms/00-input.mustache
deleted file mode 100755
index c6f1cd0..0000000
--- a/dist/_patterns/00-atoms/05-forms/00-input.mustache
+++ /dev/null
@@ -1,5 +0,0 @@
-<input type="text" class="form-control" placeholder="Placeholder Text" aria-describedby="basic-addon1">
-
-
-
-
diff --git a/dist/_patterns/00-atoms/07-tables/00-table.md b/dist/_patterns/00-atoms/06-tables/00-table.md
similarity index 100%
rename from dist/_patterns/00-atoms/07-tables/00-table.md
rename to dist/_patterns/00-atoms/06-tables/00-table.md
diff --git a/dist/_patterns/00-atoms/07-tables/00-table.mustache b/dist/_patterns/00-atoms/06-tables/00-table.mustache
similarity index 100%
rename from dist/_patterns/00-atoms/07-tables/00-table.mustache
rename to dist/_patterns/00-atoms/06-tables/00-table.mustache
diff --git a/dist/_patterns/00-atoms/08-media/00-badges.md b/dist/_patterns/00-atoms/07-media/00-badges.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/00-badges.md
rename to dist/_patterns/00-atoms/07-media/00-badges.md
diff --git a/dist/_patterns/00-atoms/08-media/00-badges.mustache b/dist/_patterns/00-atoms/07-media/00-badges.mustache
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/00-badges.mustache
rename to dist/_patterns/00-atoms/07-media/00-badges.mustache
diff --git a/dist/_patterns/00-atoms/08-media/02-labels.md b/dist/_patterns/00-atoms/07-media/02-labels.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/02-labels.md
rename to dist/_patterns/00-atoms/07-media/02-labels.md
diff --git a/dist/_patterns/00-atoms/08-media/02-labels.mustache b/dist/_patterns/00-atoms/07-media/02-labels.mustache
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/02-labels.mustache
rename to dist/_patterns/00-atoms/07-media/02-labels.mustache
diff --git a/dist/_patterns/00-atoms/08-media/03-labels-variants.md b/dist/_patterns/00-atoms/07-media/03-labels-variants.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/03-labels-variants.md
rename to dist/_patterns/00-atoms/07-media/03-labels-variants.md
diff --git a/dist/_patterns/00-atoms/08-media/03-labels-variants.mustache b/dist/_patterns/00-atoms/07-media/03-labels-variants.mustache
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/03-labels-variants.mustache
rename to dist/_patterns/00-atoms/07-media/03-labels-variants.mustache
diff --git a/dist/_patterns/00-atoms/08-media/04-progress-bars.md b/dist/_patterns/00-atoms/07-media/04-progress-bars.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/04-progress-bars.md
rename to dist/_patterns/00-atoms/07-media/04-progress-bars.md
diff --git a/dist/_patterns/00-atoms/07-media/04-progress-bars.mustache b/dist/_patterns/00-atoms/07-media/04-progress-bars.mustache
new file mode 100755
index 0000000..c18d805
--- /dev/null
+++ b/dist/_patterns/00-atoms/07-media/04-progress-bars.mustache
@@ -0,0 +1,6 @@
+<div class="progress">
+	<div class="progress-bar {{ progressBarClass }}" role="progressbar" aria-valuenow="{{ ariaNow }}" aria-valuemin="{{ ariaMin }}" aria-valuemax="{{ ariaMax }}" style="width: {{ ariaNow }}%;{{# progressMinWidth }}min-width: {{ progressMinWidth }}em{{/ progressMinWidth }}">
+    	{{# removeProgressText }}<span class="sr-only">{{/ removeProgressText }}{{ progressCompleteText }}{{# removeProgressText }}</span>{{/ removeProgressText }}
+	</div>
+</div>
+
diff --git a/dist/_patterns/00-atoms/08-media/05-progress-bars-variants.md b/dist/_patterns/00-atoms/07-media/05-progress-bars-variants.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/05-progress-bars-variants.md
rename to dist/_patterns/00-atoms/07-media/05-progress-bars-variants.md
diff --git a/dist/_patterns/00-atoms/07-media/05-progress-bars-variants.mustache b/dist/_patterns/00-atoms/07-media/05-progress-bars-variants.mustache
new file mode 100755
index 0000000..cbab2ab
--- /dev/null
+++ b/dist/_patterns/00-atoms/07-media/05-progress-bars-variants.mustache
@@ -0,0 +1,88 @@
+<h2 id="progress-label">With label</h2>
+<p>Remove the <code>&lt;span&gt;</code> with <code>.sr-only</code> class from within the progress bar to show a visible percentage.</p>
+<div class="progress">
+	<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
+    60%
+  	</div>
+</div>
+
+<p>To ensure that the label text remains legible even for low percentages, consider adding a <code>min-width</code> to the progress bar.</p>
+<div class="progress">
+	<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;">
+    0%
+  	</div>
+</div>
+<div class="progress">
+	<div class="progress-bar" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 2%;">
+    2%
+  	</div>
+</div>
+
+<h2 id="progress-alternatives">Contextual alternatives</h2>
+<p>Progress bars use some of the same button and alert classes for consistent styles.</p>
+<div class="progress">
+  	<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
+    	<span class="sr-only">40% Complete (success)</span>
+  	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
+    	<span class="sr-only">20% Complete</span>
+  	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
+    	<span class="sr-only">60% Complete (warning)</span>
+  	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
+    	<span class="sr-only">80% Complete (danger)</span>
+  	</div>
+</div>
+
+
+<h2 id="progress-striped">Striped</h2>
+<p>Uses a gradient to create a striped effect. Not available in IE9 and below.</p>
+<div class="progress">
+	<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
+    	<span class="sr-only">40% Complete (success)</span>
+	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
+    	<span class="sr-only">20% Complete</span>
+  	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
+    	<span class="sr-only">60% Complete (warning)</span>
+  	</div>
+</div>
+<div class="progress">
+  	<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
+    	<span class="sr-only">80% Complete (danger)</span>
+  	</div>
+</div>
+
+<h2 id="progress-animated">Animated</h2>
+<p>Add <code>.active</code> to <code>.progress-bar-striped</code> to animate the stripes right to left. Not available in IE9 and below.</p>
+<div class="progress">
+  	<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
+</div>
+
+
+<h2 id="progress-stacked">Stacked</h2>
+<p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
+<div class="progress">
+  	<div class="progress-bar progress-bar-success" style="width: 35%">
+    	<span class="sr-only">35% Complete (success)</span>
+  	</div>
+  	<div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
+    	<span class="sr-only">20% Complete (warning)</span>
+  	</div>
+  	<div class="progress-bar progress-bar-danger" style="width: 10%">
+    	<span class="sr-only">10% Complete (danger)</span>
+  	</div>
+</div>
+
diff --git a/dist/_patterns/00-atoms/08-media/06-thumbnails.md b/dist/_patterns/00-atoms/07-media/06-thumbnails.md
similarity index 100%
rename from dist/_patterns/00-atoms/08-media/06-thumbnails.md
rename to dist/_patterns/00-atoms/07-media/06-thumbnails.md
diff --git a/dist/_patterns/00-atoms/08-media/06-thumbnails.mustache b/dist/_patterns/00-atoms/07-media/06-thumbnails.mustache
similarity index 53%
rename from dist/_patterns/00-atoms/08-media/06-thumbnails.mustache
rename to dist/_patterns/00-atoms/07-media/06-thumbnails.mustache
index 03822c6..cd743f2 100755
--- a/dist/_patterns/00-atoms/08-media/06-thumbnails.mustache
+++ b/dist/_patterns/00-atoms/07-media/06-thumbnails.mustache
@@ -1,4 +1,4 @@
-<a href="#" class="thumbnail">
+<a href="{{ url }}" class="thumbnail">
 	<img src="{{ src }}" alt="{{ alt }}">
 </a>
 
diff --git a/dist/_patterns/00-atoms/08-media/04-progress-bars.mustache b/dist/_patterns/00-atoms/08-media/04-progress-bars.mustache
deleted file mode 100755
index c71b56f..0000000
--- a/dist/_patterns/00-atoms/08-media/04-progress-bars.mustache
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="progress">
-	<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-    	<span class="{{ progressLabelClass }}">60% Complete</span>
-	</div>
-</div>
-
diff --git a/dist/_patterns/00-atoms/08-media/05-progress-bars-variants.mustache b/dist/_patterns/00-atoms/08-media/05-progress-bars-variants.mustache
deleted file mode 100755
index ed14d33..0000000
--- a/dist/_patterns/00-atoms/08-media/05-progress-bars-variants.mustache
+++ /dev/null
@@ -1,98 +0,0 @@
-<h2 id="progress-label">With label</h2>
-<p>Remove the <code>&lt;span&gt;</code> with <code>.sr-only</code> class from within the progress bar to show a visible percentage.</p>
-<div class="bs-example" data-example-id="progress-bar-with-label">
-	<div class="progress">
-    	<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
-        60%
-      	</div>
-    </div>
-</div>
-
-<p>To ensure that the label text remains legible even for low percentages, consider adding a <code>min-width</code> to the progress bar.</p>
-<div class="bs-example" data-example-id="progress-bar-at-low-percentage">
-	<div class="progress">
-    	<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em;">
-        0%
-      	</div>
-    </div>
-	<div class="progress">
-		<div class="progress-bar" role="progressbar" aria-valuenow="2" aria-valuemin="0" aria-valuemax="100" style="min-width: 2em; width: 2%;">
-        2%
-      	</div>
-    </div>
-</div>
-
-<h2 id="progress-alternatives">Contextual alternatives</h2>
-<p>Progress bars use some of the same button and alert classes for consistent styles.</p>
-<div class="bs-example" data-example-id="contextual-progress-bar">
-    <div class="progress">
-      	<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-        	<span class="sr-only">40% Complete (success)</span>
-      	</div>
-    </div>
-	<div class="progress">
-      	<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-        	<span class="sr-only">20% Complete</span>
-      	</div>
-    </div>
-    <div class="progress">
-      	<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-        	<span class="sr-only">60% Complete (warning)</span>
-      	</div>
-    </div>
-    <div class="progress">
-      	<div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-        	<span class="sr-only">80% Complete (danger)</span>
-      	</div>
-    </div>
-</div>
-
-
-<h2 id="progress-striped">Striped</h2>
-<p>Uses a gradient to create a striped effect. Not available in IE9 and below.</p>
-<div class="bs-example" data-example-id="striped-progress-bar">
-	<div class="progress">
-    	<div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-        	<span class="sr-only">40% Complete (success)</span>
-    	</div>
-    </div>
-    <div class="progress">
-      	<div class="progress-bar progress-bar-info progress-bar-striped" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-        	<span class="sr-only">20% Complete</span>
-      	</div>
-    </div>
-    <div class="progress">
-      	<div class="progress-bar progress-bar-warning progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-        	<span class="sr-only">60% Complete (warning)</span>
-      	</div>
-    </div>
-    <div class="progress">
-      	<div class="progress-bar progress-bar-danger progress-bar-striped" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-        	<span class="sr-only">80% Complete (danger)</span>
-      	</div>
-    </div>
-</div>
-
-<h2 id="progress-animated">Animated</h2>
-<p>Add <code>.active</code> to <code>.progress-bar-striped</code> to animate the stripes right to left. Not available in IE9 and below.</p>
-<div class="bs-example" data-example-id="animated-progress-bar">
-	<div class="progress">
-      	<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
-    </div>
-</div>
-
-<h2 id="progress-stacked">Stacked</h2>
-<p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
-<div class="bs-example" data-example-id="stacked-progress-bar">
-    <div class="progress">
-      	<div class="progress-bar progress-bar-success" style="width: 35%">
-        	<span class="sr-only">35% Complete (success)</span>
-      	</div>
-	  	<div class="progress-bar progress-bar-warning progress-bar-striped" style="width: 20%">
-        	<span class="sr-only">20% Complete (warning)</span>
-      	</div>
-	  	<div class="progress-bar progress-bar-danger" style="width: 10%">
-        	<span class="sr-only">10% Complete (danger)</span>
-      	</div>
-    </div>
-</div>
diff --git a/dist/_patterns/01-molecules/02-blocks/00-panels.md b/dist/_patterns/01-molecules/00-blocks/00-panels.md
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/00-panels.md
rename to dist/_patterns/01-molecules/00-blocks/00-panels.md
diff --git a/dist/_patterns/01-molecules/02-blocks/00-panels.mustache b/dist/_patterns/01-molecules/00-blocks/00-panels.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/00-panels.mustache
rename to dist/_patterns/01-molecules/00-blocks/00-panels.mustache
diff --git a/dist/_patterns/01-molecules/02-blocks/01-panels-variants.md b/dist/_patterns/01-molecules/00-blocks/01-panels-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/01-panels-variants.md
rename to dist/_patterns/01-molecules/00-blocks/01-panels-variants.md
diff --git a/dist/_patterns/01-molecules/00-blocks/01-panels-variants.mustache b/dist/_patterns/01-molecules/00-blocks/01-panels-variants.mustache
new file mode 100755
index 0000000..cd4efe7
--- /dev/null
+++ b/dist/_patterns/01-molecules/00-blocks/01-panels-variants.mustache
@@ -0,0 +1,68 @@
+<h2 id="panels-heading">Panel with heading</h2>
+<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
+<p>For proper link coloring, be sure to place links in headings within <code>.panel-title</code>.</p>
+<div class="panel panel-default">
+	<div class="panel-heading">Panel heading without title</div>
+		<div class="panel-body">
+			Panel content
+  		</div>
+	</div>
+<div class="panel panel-default">
+	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+<h2 id="panels-footer">Panel with footer</h2>
+<p>Wrap buttons or secondary text in <code>.panel-footer</code>. Note that panel footers <strong>do not</strong> inherit colors and borders when using contextual variations as they are not meant to be in the foreground.</p>
+<div class="panel panel-default">
+	<div class="panel-body">
+    	Panel content
+  	</div>
+  	<div class="panel-footer">Panel footer</div>
+</div>
+<h2 id="panels-alternatives">Contextual alternatives</h2>
+<p>Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.</p>
+<div class="panel panel-primary">
+	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+<div class="panel panel-success">
+	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+<div class="panel panel-info">
+  	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+<div class="panel panel-warning">
+  	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+<div class="panel panel-danger">
+  	<div class="panel-heading">
+    	<h3 class="panel-title">Panel title</h3>
+  	</div>
+  	<div class="panel-body">
+    	Panel content
+  	</div>
+</div>
+
diff --git a/dist/_patterns/01-molecules/02-blocks/03-wells.md b/dist/_patterns/01-molecules/00-blocks/02-wells.md
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/03-wells.md
rename to dist/_patterns/01-molecules/00-blocks/02-wells.md
diff --git a/dist/_patterns/01-molecules/02-blocks/03-wells.mustache b/dist/_patterns/01-molecules/00-blocks/02-wells.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/03-wells.mustache
rename to dist/_patterns/01-molecules/00-blocks/02-wells.mustache
diff --git a/dist/_patterns/01-molecules/02-blocks/04-wells-variants.md b/dist/_patterns/01-molecules/00-blocks/03-wells-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/02-blocks/04-wells-variants.md
rename to dist/_patterns/01-molecules/00-blocks/03-wells-variants.md
diff --git a/dist/_patterns/01-molecules/02-blocks/04-wells-variants.mustache b/dist/_patterns/01-molecules/00-blocks/03-wells-variants.mustache
similarity index 54%
rename from dist/_patterns/01-molecules/02-blocks/04-wells-variants.mustache
rename to dist/_patterns/01-molecules/00-blocks/03-wells-variants.mustache
index cfe1797..19c69e3 100755
--- a/dist/_patterns/01-molecules/02-blocks/04-wells-variants.mustache
+++ b/dist/_patterns/01-molecules/00-blocks/03-wells-variants.mustache
@@ -1,7 +1,7 @@
 <div class="well well-lg">
-	{{ wellText }}
+	Look, I'm in a large well!
 </div>
 <div class="well well-sm">
-	{{ wellText }}
+  Look, I'm in a small well!
 </div>
 
diff --git a/dist/_patterns/01-molecules/03-media/00-jumbotron.md b/dist/_patterns/01-molecules/01-media/00-jumbotron.md
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/00-jumbotron.md
rename to dist/_patterns/01-molecules/01-media/00-jumbotron.md
diff --git a/dist/_patterns/01-molecules/03-media/00-jumbotron.mustache b/dist/_patterns/01-molecules/01-media/00-jumbotron.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/00-jumbotron.mustache
rename to dist/_patterns/01-molecules/01-media/00-jumbotron.mustache
diff --git a/dist/_patterns/01-molecules/03-media/01-media.md b/dist/_patterns/01-molecules/01-media/01-media.md
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/01-media.md
rename to dist/_patterns/01-molecules/01-media/01-media.md
diff --git a/dist/_patterns/01-molecules/03-media/01-media.mustache b/dist/_patterns/01-molecules/01-media/01-media.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/01-media.mustache
rename to dist/_patterns/01-molecules/01-media/01-media.mustache
diff --git a/dist/_patterns/01-molecules/03-media/02-media-variants.md b/dist/_patterns/01-molecules/01-media/02-media-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/02-media-variants.md
rename to dist/_patterns/01-molecules/01-media/02-media-variants.md
diff --git a/dist/_patterns/01-molecules/03-media/02-media-variants.mustache b/dist/_patterns/01-molecules/01-media/02-media-variants.mustache
similarity index 59%
rename from dist/_patterns/01-molecules/03-media/02-media-variants.mustache
rename to dist/_patterns/01-molecules/01-media/02-media-variants.mustache
index 319390a..71588f5 100755
--- a/dist/_patterns/01-molecules/03-media/02-media-variants.mustache
+++ b/dist/_patterns/01-molecules/01-media/02-media-variants.mustache
@@ -51,41 +51,39 @@
 <p>The classes <code>.pull-left</code> and <code>.pull-right</code> also exist and were previously used as part of the media component, but are deprecated for that use as of v3.3.0. They are approximately equivalent to <code>.media-left</code> and <code>.media-right</code>, except that <code>.media-right</code> should be placed after the <code>.media-body</code> in the html.</p>
 <h2 id="media-alignment">Media alignment</h2>
 <p>The images or other media can be aligned top, middle, or bottom. The default is top aligned.</p>
-<div class="bs-example" data-example-id="media-alignment">
-    <div class="media">
-    	<div class="media-left">
-        	<a href="#">
-				<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-        	</a>
-      	</div>
-	  	<div class="media-body">
-        	<h4 class="media-heading">Top aligned media</h4>
-			<p>{{ text }}</p>
-			<p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
-      	</div>
-    </div>
-    <div class="media">
-    	<div class="media-left media-middle">
-        	<a href="#">
-				<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-        	</a>
-    	</div>
-		<div class="media-body">
-        	<h4 class="media-heading">Middle aligned media</h4>
-			<p>{{ text }}</p>
-			<p>{{ text }}</p>
-      	</div>
-    </div>
-    <div class="media">
-    	<div class="media-left media-bottom">
-        	<a href="#">
-				<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-        	</a>
-    	</div>
-		<div class="media-body">
-        	<h4 class="media-heading">Bottom aligned media</h4>
-			<p>{{ text }}</p>
-			<p>{{ text }}</p>
-      	</div>
-    </div>
+<div class="media">
+	<div class="media-left">
+    	<a href="#">
+			<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
+    	</a>
+  	</div>
+  	<div class="media-body">
+    	<h4 class="media-heading">Top aligned media</h4>
+		<p>{{ text }}</p>
+		<p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+  	</div>
+</div>
+<div class="media">
+	<div class="media-left media-middle">
+    	<a href="#">
+			<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
+    	</a>
+	</div>
+	<div class="media-body">
+    	<h4 class="media-heading">Middle aligned media</h4>
+		<p>{{ text }}</p>
+		<p>{{ text }}</p>
+  	</div>
+</div>
+<div class="media">
+	<div class="media-left media-bottom">
+    	<a href="#">
+			<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
+    	</a>
+	</div>
+	<div class="media-body">
+    	<h4 class="media-heading">Bottom aligned media</h4>
+		<p>{{ text }}</p>
+		<p>{{ text }}</p>
+  	</div>
 </div>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/03-media/03-responsive-embed.md b/dist/_patterns/01-molecules/01-media/03-responsive-embed.md
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/03-responsive-embed.md
rename to dist/_patterns/01-molecules/01-media/03-responsive-embed.md
diff --git a/dist/_patterns/01-molecules/03-media/03-responsive-embed.mustache b/dist/_patterns/01-molecules/01-media/03-responsive-embed.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/03-responsive-embed.mustache
rename to dist/_patterns/01-molecules/01-media/03-responsive-embed.mustache
diff --git a/dist/_patterns/01-molecules/03-media/04-thumbnails-caption.md b/dist/_patterns/01-molecules/01-media/04-thumbnails-caption.md
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/04-thumbnails-caption.md
rename to dist/_patterns/01-molecules/01-media/04-thumbnails-caption.md
diff --git a/dist/_patterns/01-molecules/03-media/04-thumbnails-caption.mustache b/dist/_patterns/01-molecules/01-media/04-thumbnails-caption.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/03-media/04-thumbnails-caption.mustache
rename to dist/_patterns/01-molecules/01-media/04-thumbnails-caption.mustache
diff --git a/dist/_patterns/01-molecules/02-blocks/01-panels-variants.mustache b/dist/_patterns/01-molecules/02-blocks/01-panels-variants.mustache
deleted file mode 100755
index 6d16534..0000000
--- a/dist/_patterns/01-molecules/02-blocks/01-panels-variants.mustache
+++ /dev/null
@@ -1,75 +0,0 @@
-<h2 id="panels-heading">Panel with heading</h2>
-<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
-<p>For proper link coloring, be sure to place links in headings within <code>.panel-title</code>.</p>
-<div class="bs-example" data-example-id="panel-with-heading">
-    <div class="panel panel-default">
-    	<div class="panel-heading">Panel heading without title</div>
-			<div class="panel-body">
-				Panel content
-      		</div>
-    	</div>
-    <div class="panel panel-default">
-    	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-</div>
-<h2 id="panels-footer">Panel with footer</h2>
-<p>Wrap buttons or secondary text in <code>.panel-footer</code>. Note that panel footers <strong>do not</strong> inherit colors and borders when using contextual variations as they are not meant to be in the foreground.</p>
-<div class="bs-example" data-example-id="panel-with-footer">
-    <div class="panel panel-default">
-    	<div class="panel-body">
-        	Panel content
-      	</div>
-	  	<div class="panel-footer">Panel footer</div>
-    </div>
-</div>
-
-<h2 id="panels-alternatives">Contextual alternatives</h2>
-<p>Like other components, easily make a panel more meaningful to a particular context by adding any of the contextual state classes.</p>
-<div class="bs-example" data-example-id="contextual-panels">
-    <div class="panel panel-primary">
-    	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-    <div class="panel panel-success">
-    	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-    <div class="panel panel-info">
-      	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-    <div class="panel panel-warning">
-      	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-    <div class="panel panel-danger">
-      	<div class="panel-heading">
-        	<h3 class="panel-title">Panel title</h3>
-      	</div>
-	  	<div class="panel-body">
-        	Panel content
-      	</div>
-    </div>
-</div>
-
diff --git a/dist/_patterns/01-molecules/04-forms/00-input-groups.md b/dist/_patterns/01-molecules/02-forms/00-input-groups.md
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/00-input-groups.md
rename to dist/_patterns/01-molecules/02-forms/00-input-groups.md
diff --git a/dist/_patterns/01-molecules/04-forms/00-input-groups.mustache b/dist/_patterns/01-molecules/02-forms/00-input-groups.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/00-input-groups.mustache
rename to dist/_patterns/01-molecules/02-forms/00-input-groups.mustache
diff --git a/dist/_patterns/01-molecules/04-forms/01-input-groups-variants.md b/dist/_patterns/01-molecules/02-forms/01-input-groups-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/01-input-groups-variants.md
rename to dist/_patterns/01-molecules/02-forms/01-input-groups-variants.md
diff --git a/dist/_patterns/01-molecules/04-forms/01-input-groups-variants.mustache b/dist/_patterns/01-molecules/02-forms/01-input-groups-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/01-input-groups-variants.mustache
rename to dist/_patterns/01-molecules/02-forms/01-input-groups-variants.mustache
diff --git a/dist/_patterns/01-molecules/04-forms/02-input-groups-checkbox.md b/dist/_patterns/01-molecules/02-forms/02-input-groups-checkbox.md
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/02-input-groups-checkbox.md
rename to dist/_patterns/01-molecules/02-forms/02-input-groups-checkbox.md
diff --git a/dist/_patterns/01-molecules/04-forms/02-input-groups-checkbox.mustache b/dist/_patterns/01-molecules/02-forms/02-input-groups-checkbox.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/02-input-groups-checkbox.mustache
rename to dist/_patterns/01-molecules/02-forms/02-input-groups-checkbox.mustache
diff --git a/dist/_patterns/01-molecules/04-forms/03-input-groups-radio.md b/dist/_patterns/01-molecules/02-forms/03-input-groups-radio.md
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/03-input-groups-radio.md
rename to dist/_patterns/01-molecules/02-forms/03-input-groups-radio.md
diff --git a/dist/_patterns/01-molecules/04-forms/03-input-groups-radio.mustache b/dist/_patterns/01-molecules/02-forms/03-input-groups-radio.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/03-input-groups-radio.mustache
rename to dist/_patterns/01-molecules/02-forms/03-input-groups-radio.mustache
diff --git a/dist/_patterns/01-molecules/04-forms/04-input-groups-button.md b/dist/_patterns/01-molecules/02-forms/04-input-groups-button.md
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/04-input-groups-button.md
rename to dist/_patterns/01-molecules/02-forms/04-input-groups-button.md
diff --git a/dist/_patterns/01-molecules/04-forms/04-input-groups-button.mustache b/dist/_patterns/01-molecules/02-forms/04-input-groups-button.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/04-forms/04-input-groups-button.mustache
rename to dist/_patterns/01-molecules/02-forms/04-input-groups-button.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/00-breadcrumbs.md b/dist/_patterns/01-molecules/03-navigation/00-breadcrumbs.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/00-breadcrumbs.md
rename to dist/_patterns/01-molecules/03-navigation/00-breadcrumbs.md
diff --git a/dist/_patterns/01-molecules/05-navigation/00-breadcrumbs.mustache b/dist/_patterns/01-molecules/03-navigation/00-breadcrumbs.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/00-breadcrumbs.mustache
rename to dist/_patterns/01-molecules/03-navigation/00-breadcrumbs.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/01-button-dropdown.md b/dist/_patterns/01-molecules/03-navigation/01-button-dropdown.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/01-button-dropdown.md
rename to dist/_patterns/01-molecules/03-navigation/01-button-dropdown.md
diff --git a/dist/_patterns/01-molecules/05-navigation/01-button-dropdown.mustache b/dist/_patterns/01-molecules/03-navigation/01-button-dropdown.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/01-button-dropdown.mustache
rename to dist/_patterns/01-molecules/03-navigation/01-button-dropdown.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/02-button-dropdown-variants.md b/dist/_patterns/01-molecules/03-navigation/02-button-dropdown-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/02-button-dropdown-variants.md
rename to dist/_patterns/01-molecules/03-navigation/02-button-dropdown-variants.md
diff --git a/dist/_patterns/01-molecules/05-navigation/02-button-dropdown-variants.mustache b/dist/_patterns/01-molecules/03-navigation/02-button-dropdown-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/02-button-dropdown-variants.mustache
rename to dist/_patterns/01-molecules/03-navigation/02-button-dropdown-variants.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/03-button-dropdown-split.md b/dist/_patterns/01-molecules/03-navigation/03-button-dropdown-split.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/03-button-dropdown-split.md
rename to dist/_patterns/01-molecules/03-navigation/03-button-dropdown-split.md
diff --git a/dist/_patterns/01-molecules/05-navigation/03-button-dropdown-split.mustache b/dist/_patterns/01-molecules/03-navigation/03-button-dropdown-split.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/03-button-dropdown-split.mustache
rename to dist/_patterns/01-molecules/03-navigation/03-button-dropdown-split.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/04-button-dropdown-split-variants.md b/dist/_patterns/01-molecules/03-navigation/04-button-dropdown-split-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/04-button-dropdown-split-variants.md
rename to dist/_patterns/01-molecules/03-navigation/04-button-dropdown-split-variants.md
diff --git a/dist/_patterns/01-molecules/05-navigation/04-button-dropdown-split-variants.mustache b/dist/_patterns/01-molecules/03-navigation/04-button-dropdown-split-variants.mustache
similarity index 99%
rename from dist/_patterns/01-molecules/05-navigation/04-button-dropdown-split-variants.mustache
rename to dist/_patterns/01-molecules/03-navigation/04-button-dropdown-split-variants.mustache
index a7e0f29..0613ed9 100644
--- a/dist/_patterns/01-molecules/05-navigation/04-button-dropdown-split-variants.mustache
+++ b/dist/_patterns/01-molecules/03-navigation/04-button-dropdown-split-variants.mustache
@@ -1,4 +1,3 @@
-
 <div class="btn-group">
 	<button type="button" class="btn btn-primary">Primary</button>
 	<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/dist/_patterns/01-molecules/05-navigation/05-button-dropup.md b/dist/_patterns/01-molecules/03-navigation/05-button-dropup.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/05-button-dropup.md
rename to dist/_patterns/01-molecules/03-navigation/05-button-dropup.md
diff --git a/dist/_patterns/01-molecules/05-navigation/05-button-dropup.mustache b/dist/_patterns/01-molecules/03-navigation/05-button-dropup.mustache
similarity index 87%
rename from dist/_patterns/01-molecules/05-navigation/05-button-dropup.mustache
rename to dist/_patterns/01-molecules/03-navigation/05-button-dropup.mustache
index 57648da..0f42fd9 100644
--- a/dist/_patterns/01-molecules/05-navigation/05-button-dropup.mustache
+++ b/dist/_patterns/01-molecules/03-navigation/05-button-dropup.mustache
@@ -2,11 +2,10 @@
     {{> atoms-button }}
     <button type="button" class="btn {{ buttonClass }} dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     	{{# caret }}<span class="{{ caret }}"></span>{{/ caret }}
-		<span class="sr-only">{{ cta }}</span>
 	</button>
 	<ul class="dropdown-menu">
 		{{# dropdownList }}
-		<li {{# separator }}role="separator"{{/ separator }} {{# listItemClass }} class="{{ listItemClass }}"{{/ listItemClass }}><a href="#">{{ text }}</a></li>
+		<li {{# separator }}role="separator"{{/ separator }} {{# listItemClass }} class="{{ listItemClass }}"{{/ listItemClass }}><a href="{{ url }}">{{ text }}</a></li>
 		{{/ dropdownList }}
   	</ul>
 </div><!-- /btn-group -->
diff --git a/dist/_patterns/01-molecules/05-navigation/06-button-dropup-variants.md b/dist/_patterns/01-molecules/03-navigation/06-button-dropup-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/06-button-dropup-variants.md
rename to dist/_patterns/01-molecules/03-navigation/06-button-dropup-variants.md
diff --git a/dist/_patterns/01-molecules/03-navigation/06-button-dropup-variants.mustache b/dist/_patterns/01-molecules/03-navigation/06-button-dropup-variants.mustache
new file mode 100644
index 0000000..68661fe
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/06-button-dropup-variants.mustache
@@ -0,0 +1,13 @@
+<div class="btn-group dropup">
+	<button type="button" class="btn btn-primary">Right dropup</button>
+	<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    	<span class="caret"></span>
+	</button>
+	<ul class="dropdown-menu dropdown-menu-right">
+    	<li><a href="#">Action</a></li>
+		<li><a href="#">Another action</a></li>
+		<li><a href="#">Something else here</a></li>
+		<li role="separator" class="divider"></li>
+		<li><a href="#">Separated link</a></li>
+  	</ul>
+</div><!-- /btn-group -->
diff --git a/dist/_patterns/01-molecules/05-navigation/07-dropdown.md b/dist/_patterns/01-molecules/03-navigation/07-dropdown.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/07-dropdown.md
rename to dist/_patterns/01-molecules/03-navigation/07-dropdown.md
diff --git a/dist/_patterns/01-molecules/03-navigation/07-dropdown.mustache b/dist/_patterns/01-molecules/03-navigation/07-dropdown.mustache
new file mode 100644
index 0000000..dc0cbd3
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/07-dropdown.mustache
@@ -0,0 +1,11 @@
+<div class="{{ dropdownClass}} clearfix">
+	<button class="btn {{ buttonClass }} dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+	Dropdown
+		{{# caret }}<span class="{{ caret }}"></span>{{/ caret }}
+	</button>
+	<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+		{{# dropdownList }}
+		<li {{# separator }}role="separator"{{/ separator }} {{# listItemClass }} class="{{ listItemClass }}"{{/ listItemClass }}><a href="{{ url }}">{{ text }}</a></li>
+		{{/ dropdownList }}
+	</ul>
+</div>
diff --git a/dist/_patterns/01-molecules/05-navigation/08-dropdown-variants.md b/dist/_patterns/01-molecules/03-navigation/08-dropdown-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/08-dropdown-variants.md
rename to dist/_patterns/01-molecules/03-navigation/08-dropdown-variants.md
diff --git a/dist/_patterns/01-molecules/03-navigation/08-dropdown-variants.mustache b/dist/_patterns/01-molecules/03-navigation/08-dropdown-variants.mustache
new file mode 100644
index 0000000..17f9578
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/08-dropdown-variants.mustache
@@ -0,0 +1,65 @@
+<p>Dropdown menus can be changed to expand upwards (instead of downwards) by adding <code>.dropup</code> to the parent.</p>
+<div class="dropup clearfix">
+    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        Dropup
+        <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
+        <li><a href="#">Action</a></li>
+        <li><a href="#">Another action</a></li>
+        <li><a href="#">Something else here</a></li>
+    </ul>
+</div>
+
+<h2 id="dropdowns-headers">Headers</h2>
+<p>Add a header to label sections of actions in any dropdown menu.</p>
+<div class="bs-example"> 
+	<div class="dropdown clearfix">
+	    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+	        Dropdown
+	        <span class="caret"></span>
+	    </button>
+	    <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
+	        <li class="dropdown-header">Dropdown header</li>
+	        <li><a href="#">Action</a></li>
+	        <li><a href="#">Another action</a></li>
+	        <li><a href="#">Something else here</a></li>
+	        <li class="dropdown-header">Dropdown header</li>
+	        <li><a href="#">Separated link</a></li>
+	    </ul>
+	</div>
+</div>
+
+<h2 id="dropdowns-divider">Divider</h2>
+<p>Add a divider to separate series of links in a dropdown menu.</p>
+<div class="bs-example"> 
+	<div class="dropdown clearfix">
+	    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+	        Dropdown
+	        <span class="caret"></span>
+	    </button>
+	    <ul class="dropdown-menu" aria-labelledby="dropdownMenuDivider">
+	        <li><a href="#">Action</a></li>
+	        <li><a href="#">Another action</a></li>
+	        <li><a href="#">Something else here</a></li>
+	        <li role="separator" class="divider"></li>
+	        <li><a href="#">Separated link</a></li>
+	    </ul>
+	</div>
+</div>
+
+  <h2 id="dropdowns-disabled">Disabled menu items</h2>
+  <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">
+	    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+	        Dropdown
+	        <span class="caret"></span>
+	    </button>
+	    <ul class="dropdown-menu" aria-labelledby="dropdownMenu4">
+	        <li><a href="#">Regular link</a></li>
+	        <li class="disabled"><a href="#">Disabled link</a></li>
+	        <li><a href="#">Another link</a></li>
+	    </ul>
+	</div>
+</div>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/05-navigation/09-navs.md b/dist/_patterns/01-molecules/03-navigation/09-navs.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/09-navs.md
rename to dist/_patterns/01-molecules/03-navigation/09-navs.md
diff --git a/dist/_patterns/01-molecules/05-navigation/09-navs.mustache b/dist/_patterns/01-molecules/03-navigation/09-navs.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/09-navs.mustache
rename to dist/_patterns/01-molecules/03-navigation/09-navs.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/10-navs-variants.md b/dist/_patterns/01-molecules/03-navigation/10-navs-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/10-navs-variants.md
rename to dist/_patterns/01-molecules/03-navigation/10-navs-variants.md
diff --git a/dist/_patterns/01-molecules/05-navigation/10-navs-variants.mustache b/dist/_patterns/01-molecules/03-navigation/10-navs-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/10-navs-variants.mustache
rename to dist/_patterns/01-molecules/03-navigation/10-navs-variants.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/12-pagination.md b/dist/_patterns/01-molecules/03-navigation/12-pagination.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/12-pagination.md
rename to dist/_patterns/01-molecules/03-navigation/12-pagination.md
diff --git a/dist/_patterns/01-molecules/05-navigation/12-pagination.mustache b/dist/_patterns/01-molecules/03-navigation/12-pagination.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/12-pagination.mustache
rename to dist/_patterns/01-molecules/03-navigation/12-pagination.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/13-pagination-variants.md b/dist/_patterns/01-molecules/03-navigation/13-pagination-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/13-pagination-variants.md
rename to dist/_patterns/01-molecules/03-navigation/13-pagination-variants.md
diff --git a/dist/_patterns/01-molecules/05-navigation/13-pagination-variants.mustache b/dist/_patterns/01-molecules/03-navigation/13-pagination-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/13-pagination-variants.mustache
rename to dist/_patterns/01-molecules/03-navigation/13-pagination-variants.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/14-pager.md b/dist/_patterns/01-molecules/03-navigation/14-pager.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/14-pager.md
rename to dist/_patterns/01-molecules/03-navigation/14-pager.md
diff --git a/dist/_patterns/01-molecules/05-navigation/14-pager.mustache b/dist/_patterns/01-molecules/03-navigation/14-pager.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/14-pager.mustache
rename to dist/_patterns/01-molecules/03-navigation/14-pager.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/15-pager-variants.md b/dist/_patterns/01-molecules/03-navigation/15-pager-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/15-pager-variants.md
rename to dist/_patterns/01-molecules/03-navigation/15-pager-variants.md
diff --git a/dist/_patterns/01-molecules/05-navigation/15-pager-variants.mustache b/dist/_patterns/01-molecules/03-navigation/15-pager-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/05-navigation/15-pager-variants.mustache
rename to dist/_patterns/01-molecules/03-navigation/15-pager-variants.mustache
diff --git a/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.md b/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.md
new file mode 100644
index 0000000..266624a
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.md
@@ -0,0 +1,3 @@
+---
+title: Navbar Nav
+---
diff --git a/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.mustache b/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.mustache
new file mode 100644
index 0000000..7a3c2d9
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/16-navbar-nav.mustache
@@ -0,0 +1,15 @@
+<ul class="nav navbar-nav {{ navbarNavClass }}">
+	{{# navbarNav }}
+    <li {{# hasDropdown }}class="dropdown"{{/ hasDropdown }}{{# activeClass }}class="active" {{/ activeClass }}>
+   		<a href="{{ url }}" {{# hasDropdown }}class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"{{/ hasDropdown }}>
+	   		{{ text }}{{# hasDropdown }}<span class="caret"></span>{{/ hasDropdown }}</a>
+	   	{{# hasDropdown }}
+	  	<ul class="dropdown-menu">
+		  	{{# dropdownMenu }}
+	  		<li {{# separator }}role="separator" class="divider"{{/ separator }}><a href="{{ url }}">{{ text }}</a></li>
+	  		{{/ dropdownMenu }}
+    	</ul>
+    	{{/ hasDropdown }}
+    </li>
+    {{/ navbarNav }}
+</ul>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/03-navigation/17-navbar-form.md b/dist/_patterns/01-molecules/03-navigation/17-navbar-form.md
new file mode 100644
index 0000000..423c842
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/17-navbar-form.md
@@ -0,0 +1,3 @@
+---
+title: Navbar Form
+---
diff --git a/dist/_patterns/01-molecules/03-navigation/17-navbar-form.mustache b/dist/_patterns/01-molecules/03-navigation/17-navbar-form.mustache
new file mode 100644
index 0000000..5760124
--- /dev/null
+++ b/dist/_patterns/01-molecules/03-navigation/17-navbar-form.mustache
@@ -0,0 +1,6 @@
+<form class="navbar-form {{ navbarFormClass }}" role="search">
+    <div class="form-group">
+      <input type="text" class="form-control" placeholder="{{ placeholder }}">
+    </div>
+    {{> atoms-button }}
+</form>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/06-components/00-button-groups.md b/dist/_patterns/01-molecules/04-components/00-button-groups.md
similarity index 100%
rename from dist/_patterns/01-molecules/06-components/00-button-groups.md
rename to dist/_patterns/01-molecules/04-components/00-button-groups.md
diff --git a/dist/_patterns/01-molecules/06-components/00-button-groups.mustache b/dist/_patterns/01-molecules/04-components/00-button-groups.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/06-components/00-button-groups.mustache
rename to dist/_patterns/01-molecules/04-components/00-button-groups.mustache
diff --git a/dist/_patterns/01-molecules/06-components/01-button-groups-variants.md b/dist/_patterns/01-molecules/04-components/01-button-groups-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/06-components/01-button-groups-variants.md
rename to dist/_patterns/01-molecules/04-components/01-button-groups-variants.md
diff --git a/dist/_patterns/01-molecules/06-components/01-button-groups-variants.mustache b/dist/_patterns/01-molecules/04-components/01-button-groups-variants.mustache
similarity index 91%
rename from dist/_patterns/01-molecules/06-components/01-button-groups-variants.mustache
rename to dist/_patterns/01-molecules/04-components/01-button-groups-variants.mustache
index 80da4ff..fd71337 100755
--- a/dist/_patterns/01-molecules/06-components/01-button-groups-variants.mustache
+++ b/dist/_patterns/01-molecules/04-components/01-button-groups-variants.mustache
@@ -1,19 +1,19 @@
 <h2 id="btn-groups-toolbar">Button toolbar</h2>
 <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="btn-group" role="group" aria-label="First group">
-        <button type="button" class="btn btn-default">1</button>
-        <button type="button" class="btn btn-default">2</button>
-        <button type="button" class="btn btn-default">3</button>
-        <button type="button" class="btn btn-default">4</button>
-    </div>
-    <div class="btn-group" role="group" aria-label="Second group">
-        <button type="button" class="btn btn-default">5</button>
-        <button type="button" class="btn btn-default">6</button>
-        <button type="button" class="btn btn-default">7</button>
-    </div>
-    <div class="btn-group" role="group" aria-label="Third group">
-        <button type="button" class="btn btn-default">8</button>
-    </div>
+<div class="btn-group" role="group" aria-label="First group">
+    <button type="button" class="btn btn-default">1</button>
+    <button type="button" class="btn btn-default">2</button>
+    <button type="button" class="btn btn-default">3</button>
+    <button type="button" class="btn btn-default">4</button>
+</div>
+<div class="btn-group" role="group" aria-label="Second group">
+    <button type="button" class="btn btn-default">5</button>
+    <button type="button" class="btn btn-default">6</button>
+    <button type="button" class="btn btn-default">7</button>
+</div>
+<div class="btn-group" role="group" aria-label="Third group">
+    <button type="button" class="btn btn-default">8</button>
+</div>
 <h2 id="btn-groups-sizing">Sizing</h2>
 <p>Instead of applying button sizing classes to every button in a group, just add <code>.btn-group-*</code> to each <code>.btn-group</code>, including when nesting multiple groups.</p>
 <div class="btn-group btn-group-lg" role="group" aria-label="Large button group">
diff --git a/dist/_patterns/01-molecules/07-messaging/00-alerts.md b/dist/_patterns/01-molecules/05-messaging/00-alerts.md
similarity index 100%
rename from dist/_patterns/01-molecules/07-messaging/00-alerts.md
rename to dist/_patterns/01-molecules/05-messaging/00-alerts.md
diff --git a/dist/_patterns/01-molecules/07-messaging/00-alerts.mustache b/dist/_patterns/01-molecules/05-messaging/00-alerts.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/07-messaging/00-alerts.mustache
rename to dist/_patterns/01-molecules/05-messaging/00-alerts.mustache
diff --git a/dist/_patterns/01-molecules/07-messaging/01-alerts-variants.md b/dist/_patterns/01-molecules/05-messaging/01-alerts-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/07-messaging/01-alerts-variants.md
rename to dist/_patterns/01-molecules/05-messaging/01-alerts-variants.md
diff --git a/dist/_patterns/01-molecules/07-messaging/01-alerts-variants.mustache b/dist/_patterns/01-molecules/05-messaging/01-alerts-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/07-messaging/01-alerts-variants.mustache
rename to dist/_patterns/01-molecules/05-messaging/01-alerts-variants.mustache
diff --git a/dist/_patterns/01-molecules/05-navigation/06-button-dropup-variants.mustache b/dist/_patterns/01-molecules/05-navigation/06-button-dropup-variants.mustache
deleted file mode 100644
index 725a89c..0000000
--- a/dist/_patterns/01-molecules/05-navigation/06-button-dropup-variants.mustache
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="btn-toolbar" role="toolbar">
-    <div class="btn-group dropup">
-    	<button type="button" class="btn btn-primary">Right dropup</button>
-		<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        	<span class="caret"></span>
-			<span class="sr-only">Toggle Dropdown</span>
-		</button>
-		<ul class="dropdown-menu dropdown-menu-right">
-        	<li><a href="#">Action</a></li>
-			<li><a href="#">Another action</a></li>
-			<li><a href="#">Something else here</a></li>
-			<li role="separator" class="divider"></li>
-			<li><a href="#">Separated link</a></li>
-      	</ul>
-    </div><!-- /btn-group -->
-</div>
diff --git a/dist/_patterns/01-molecules/05-navigation/07-dropdown.mustache b/dist/_patterns/01-molecules/05-navigation/07-dropdown.mustache
deleted file mode 100644
index 948a112..0000000
--- a/dist/_patterns/01-molecules/05-navigation/07-dropdown.mustache
+++ /dev/null
@@ -1,9 +0,0 @@
-<button class="btn {{ buttonClass }} dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-Dropdown
-	{{# caret }}<span class="{{ caret }}"></span>{{/ caret }}
-</button>
-<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-	{{# dropdownList }}
-	<li {{# separator }}role="separator"{{/ separator }} {{# listItemClass }} class="{{ listItemClass }}"{{/ listItemClass }}><a href="#">{{ text }}</a></li>
-	{{/ dropdownList }}
-</ul>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/05-navigation/08-dropdown-variants.mustache b/dist/_patterns/01-molecules/05-navigation/08-dropdown-variants.mustache
deleted file mode 100644
index a95f5d2..0000000
--- a/dist/_patterns/01-molecules/05-navigation/08-dropdown-variants.mustache
+++ /dev/null
@@ -1,60 +0,0 @@
-<p>Dropdown menus can be changed to expand upwards (instead of downwards) by adding <code>.dropup</code> to the parent.</p>
-<div class="dropup clearfix">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        Dropup
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-        <li><a href="#">Action</a></li>
-        <li><a href="#">Another action</a></li>
-        <li><a href="#">Something else here</a></li>
-    </ul>
-</div>
-
-<h2 id="dropdowns-headers">Headers</h2>
-<p>Add a header to label sections of actions in any dropdown menu.</p>
-<div class="dropdown clearfix">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        Dropdown
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
-        <li class="dropdown-header">Dropdown header</li>
-        <li><a href="#">Action</a></li>
-        <li><a href="#">Another action</a></li>
-        <li><a href="#">Something else here</a></li>
-        <li class="dropdown-header">Dropdown header</li>
-        <li><a href="#">Separated link</a></li>
-    </ul>
-</div>
-
-<h2 id="dropdowns-divider">Divider</h2>
-<p>Add a divider to separate series of links in a dropdown menu.</p>
-<div class="dropdown clearfix">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        Dropdown
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenuDivider">
-        <li><a href="#">Action</a></li>
-        <li><a href="#">Another action</a></li>
-        <li><a href="#">Something else here</a></li>
-        <li role="separator" class="divider"></li>
-        <li><a href="#">Separated link</a></li>
-    </ul>
-</div>
-
-
-  <h2 id="dropdowns-disabled">Disabled menu items</h2>
-  <p>Add <code>.disabled</code> to a <code>&lt;li&gt;</code> in the dropdown to disable the link.</p>
-<div class="dropdown clearfix">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-        Dropdown
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="dropdownMenu4">
-        <li><a href="#">Regular link</a></li>
-        <li class="disabled"><a href="#">Disabled link</a></li>
-        <li><a href="#">Another link</a></li>
-    </ul>
-</div>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/08-list-groups/03-list-group.md b/dist/_patterns/01-molecules/06-list-groups/03-list-group.md
similarity index 100%
rename from dist/_patterns/01-molecules/08-list-groups/03-list-group.md
rename to dist/_patterns/01-molecules/06-list-groups/03-list-group.md
diff --git a/dist/_patterns/01-molecules/08-list-groups/03-list-group.mustache b/dist/_patterns/01-molecules/06-list-groups/03-list-group.mustache
similarity index 74%
rename from dist/_patterns/01-molecules/08-list-groups/03-list-group.mustache
rename to dist/_patterns/01-molecules/06-list-groups/03-list-group.mustache
index 04e08be..03f86f3 100755
--- a/dist/_patterns/01-molecules/08-list-groups/03-list-group.mustache
+++ b/dist/_patterns/01-molecules/06-list-groups/03-list-group.mustache
@@ -1,7 +1,7 @@
 <ul class="list-group {{ listGroupClass }}">
 	{{# listGroup }}
   	<li class="list-group-item">{{{ text }}}
-  	{{# badge }}{{> atoms-badges }}{{/ badge }}
+  		{{# badge }}{{> atoms-badges }}{{/ badge }}
   	</li>
   	{{/ listGroup }}
 </ul>
\ No newline at end of file
diff --git a/dist/_patterns/01-molecules/08-list-groups/04-list-group-variants.md b/dist/_patterns/01-molecules/06-list-groups/04-list-group-variants.md
similarity index 100%
rename from dist/_patterns/01-molecules/08-list-groups/04-list-group-variants.md
rename to dist/_patterns/01-molecules/06-list-groups/04-list-group-variants.md
diff --git a/dist/_patterns/01-molecules/08-list-groups/04-list-group-variants.mustache b/dist/_patterns/01-molecules/06-list-groups/04-list-group-variants.mustache
similarity index 100%
rename from dist/_patterns/01-molecules/08-list-groups/04-list-group-variants.mustache
rename to dist/_patterns/01-molecules/06-list-groups/04-list-group-variants.mustache
diff --git a/dist/_patterns/02-organisms/04-navigation/00-navbar.md b/dist/_patterns/02-organisms/00-navigation/00-navbar.md
similarity index 100%
rename from dist/_patterns/02-organisms/04-navigation/00-navbar.md
rename to dist/_patterns/02-organisms/00-navigation/00-navbar.md
diff --git a/dist/_patterns/02-organisms/04-navigation/00-navbar.mustache b/dist/_patterns/02-organisms/00-navigation/00-navbar.mustache
similarity index 52%
rename from dist/_patterns/02-organisms/04-navigation/00-navbar.mustache
rename to dist/_patterns/02-organisms/00-navigation/00-navbar.mustache
index 487d49b..d976f0e 100644
--- a/dist/_patterns/02-organisms/04-navigation/00-navbar.mustache
+++ b/dist/_patterns/02-organisms/00-navigation/00-navbar.mustache
@@ -3,30 +3,21 @@
     <!-- Brand and toggle get grouped for better mobile display -->
     	<div class="navbar-header"> <!-- d -->
 			<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-				<span class="sr-only">Toggle navigation</span>
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="#">Brand</a>
+			<a class="navbar-brand" href="{{ url }}">{{ navbarBrandText }}</a>
     	</div> <!-- a -->
 		<!-- Collect the nav links, forms, and other content for toggling -->
-		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"><!-- d -->
-			<ul class="nav navbar-nav">
-				<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
-				<li><a href="#">Link</a></li>
-				<li class="dropdown">
-					{{> molecules-dropdown }}
-				</li>
-      		</ul>
-	  		<form class="navbar-form navbar-left" role="search">
-	  			{{> molecules-input-groups-button}}
-      		</form>
-	  		<ul class="nav navbar-nav navbar-right">
-	  			<li><a href="#">Link</a></li>
-	  			<li class="dropdown">
-	  			{{> molecules-dropdown }}
-      		</ul>
+		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"><!-- d -->			
+			{{# navbarNavFirst }}
+			{{> molecules-navbar-nav }}
+			{{/ navbarNavFirst }}
+	  		{{> molecules-navbar-form }}
+	  		{{# navbarNavLast }}
+			{{> molecules-navbar-nav }}
+			{{/ navbarNavLast }}
     	</div><!-- /.navbar-collapse c -->
   	</div><!-- /.container-fluid b -->
 </nav>
\ No newline at end of file
diff --git a/dist/_patterns/02-organisms/04-navigation/01-navbar-variants.md b/dist/_patterns/02-organisms/00-navigation/01-navbar-variants.md
similarity index 100%
rename from dist/_patterns/02-organisms/04-navigation/01-navbar-variants.md
rename to dist/_patterns/02-organisms/00-navigation/01-navbar-variants.md
diff --git a/dist/_patterns/02-organisms/04-navigation/01-navbar-variants.mustache b/dist/_patterns/02-organisms/00-navigation/01-navbar-variants.mustache
similarity index 100%
rename from dist/_patterns/02-organisms/04-navigation/01-navbar-variants.mustache
rename to dist/_patterns/02-organisms/00-navigation/01-navbar-variants.mustache
diff --git a/dist/_patterns/02-organisms/05-forms/00-input-groups-dropdown.md b/dist/_patterns/02-organisms/01-forms/00-input-groups-dropdown.md
similarity index 100%
rename from dist/_patterns/02-organisms/05-forms/00-input-groups-dropdown.md
rename to dist/_patterns/02-organisms/01-forms/00-input-groups-dropdown.md
diff --git a/dist/_patterns/02-organisms/05-forms/00-input-groups-dropdown.mustache b/dist/_patterns/02-organisms/01-forms/00-input-groups-dropdown.mustache
similarity index 62%
rename from dist/_patterns/02-organisms/05-forms/00-input-groups-dropdown.mustache
rename to dist/_patterns/02-organisms/01-forms/00-input-groups-dropdown.mustache
index 62debdb..d9da8cb 100755
--- a/dist/_patterns/02-organisms/05-forms/00-input-groups-dropdown.mustache
+++ b/dist/_patterns/02-organisms/01-forms/00-input-groups-dropdown.mustache
@@ -2,5 +2,5 @@
 	<div class="input-group-btn">
   		{{> molecules-button-dropdown}}
 	</div><!-- /btn-group -->
-	<input type="text" class="form-control" aria-label="Text input with dropdown button">
+	{{> atoms-input }}
 </div><!-- /input-group -->
diff --git a/dist/_patterns/02-organisms/05-forms/01-input-groups-segmented.md b/dist/_patterns/02-organisms/01-forms/01-input-groups-segmented.md
similarity index 100%
rename from dist/_patterns/02-organisms/05-forms/01-input-groups-segmented.md
rename to dist/_patterns/02-organisms/01-forms/01-input-groups-segmented.md
diff --git a/dist/_patterns/02-organisms/01-forms/01-input-groups-segmented.mustache b/dist/_patterns/02-organisms/01-forms/01-input-groups-segmented.mustache
new file mode 100755
index 0000000..c6650fe
--- /dev/null
+++ b/dist/_patterns/02-organisms/01-forms/01-input-groups-segmented.mustache
@@ -0,0 +1,16 @@
+<div class="input-group">
+    {{> atoms-input }}
+    <div class="input-group-btn">
+	      {{> atoms-button }}
+	    <button type="button" class="btn {{ buttonClass }} dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+	    	{{# caret }}<span class="{{ caret }}"></span>{{/ caret }}
+			<span class="sr-only">{{ cta }}</span>
+	    </button>
+	    <ul class="dropdown-menu">
+			{{# dropdownList }}
+	    	<li {{# separator }}role="separator"{{/ separator }} {{# listItemClass }} class="{{ listItemClass }}"{{/ listItemClass }}><a href="{{ url }}">{{ text }}</a></li>
+			{{/ dropdownList }}
+	    </ul>
+    </div>
+</div><!-- /.input-group -->
+
diff --git a/dist/_patterns/02-organisms/02-media/00-media-object.md b/dist/_patterns/02-organisms/02-media/00-media-object.md
new file mode 100644
index 0000000..e9fc983
--- /dev/null
+++ b/dist/_patterns/02-organisms/02-media/00-media-object.md
@@ -0,0 +1,3 @@
+---
+title: Media Object
+---
diff --git a/dist/_patterns/02-organisms/02-media/00-media-object.mustache b/dist/_patterns/02-organisms/02-media/00-media-object.mustache
new file mode 100755
index 0000000..84648d2
--- /dev/null
+++ b/dist/_patterns/02-organisms/02-media/00-media-object.mustache
@@ -0,0 +1,24 @@
+<div class="media">
+	{{# mediaLeft }}
+    <div class="media-left {{ mediaClass }}">
+        <a href="{{ url }}">
+        	<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
+        </a>
+    </div>
+    {{/ mediaLeft }}
+	<div class="media-body">
+	  	<h4 class="media-heading">{{ heading }}</h4>
+        {{ text }}
+        {{# nestedMedia }}
+        {{> molecules-media }}
+        {{/ nestedMedia }}
+	</div>
+	{{# mediaRight }}
+    <div class="media-right {{ mediaClass }}">
+        <a href="{{ url }}">
+        	<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
+        </a>
+    </div>
+    {{/ mediaRight }}
+</div>
+
diff --git a/dist/_patterns/02-organisms/06-media/00-media-list.md b/dist/_patterns/02-organisms/02-media/01-media-list.md
similarity index 100%
rename from dist/_patterns/02-organisms/06-media/00-media-list.md
rename to dist/_patterns/02-organisms/02-media/01-media-list.md
diff --git a/dist/_patterns/02-organisms/02-media/01-media-list.mustache b/dist/_patterns/02-organisms/02-media/01-media-list.mustache
new file mode 100755
index 0000000..95c7a70
--- /dev/null
+++ b/dist/_patterns/02-organisms/02-media/01-media-list.mustache
@@ -0,0 +1,8 @@
+<!-- Media List -->
+<ul class="media-list">
+	{{# mediaList }}
+	<li>
+		{{> organisms-media-object }}	
+	</li>
+	{{/ mediaList }}
+</ul>
diff --git a/dist/_patterns/02-organisms/05-forms/01-input-groups-segmented.mustache b/dist/_patterns/02-organisms/05-forms/01-input-groups-segmented.mustache
deleted file mode 100755
index ba92b96..0000000
--- a/dist/_patterns/02-organisms/05-forms/01-input-groups-segmented.mustache
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="input-group">
-    {{> atoms-input }}
-    <div class="input-group-btn">
-        <button type="button" class="btn btn-default">Action</button>
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        	<span class="caret"></span>
-			<span class="sr-only">Toggle Dropdown</span>
-        </button>
-        <ul class="dropdown-menu dropdown-menu-right">
-        	<li><a href="#">Action</a></li>
-			<li><a href="#">Another action</a></li>
-			<li><a href="#">Something else here</a></li>
-			<li role="separator" class="divider"></li>
-			<li><a href="#">Separated link</a></li>
-        </ul>
-    </div>
-</div><!-- /.input-group -->
-
diff --git a/dist/_patterns/02-organisms/06-media/00-media-list.mustache b/dist/_patterns/02-organisms/06-media/00-media-list.mustache
deleted file mode 100755
index 3e20b6c..0000000
--- a/dist/_patterns/02-organisms/06-media/00-media-list.mustache
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- Media List -->
-<ul class="media-list">
-	<li class="media">
-	{{# mediaLeft }}
-    <div class="media-left">
-    	<a href="{{ url }}">
-        	<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-      	</a>
-    </div>
-    {{/ mediaLeft }}
-    <div class="media-body">
-    	<h4 class="media-heading">{{ heading }}</h4>
-		<p>{{ text }}</p>
-		<!-- Nested media object -->
-		<div class="media">
-        	<div class="media-left">
-				<a href="{{ url }}">
-					<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-          		</a>
-        	</div>
-			<div class="media-body">
-				<h4 class="media-heading">{{ heading }}</h4>
-				{{ text }}
-				<!-- Nested media object -->
-				{{> molecules-media}}
-        	</div>
-      	</div>
-	  	<!-- Nested media object -->
-	  	{{> molecules-media }}
-    </div>
-    {{# mediaRight }}
-    <div class="media-right">
-    	<a href="{{ url }}">
-        	<img class="media-object" src="{{ mediaImage }}" alt="{{ alt }}">
-      	</a>
-    </div>
-    {{/ mediaRight }}
-	</li>
-</ul>