more layout work

_includes/contact.html

@@ -0,0 +1,8 @@
+<div class="panel panel-default panel-contact">
+    <div class="panel-heading">
+        <h3 class="panel-title"><i class="fa fa-envelope-o"></i> Email Us</h3>
+    </div>
+    <div class="panel-body">
+        Want to talk to a human?
+    </div>
+</div>

_layouts/article.html

@@ -2,7 +2,6 @@
 layout: default
 ---
 
-<content>
 <div class="container">
     <h1 class="page-header">
         <i class="fa fa-file-text-o"></i>
@@ -17,7 +16,7 @@ layout: default
         <div class="col-sm-6">
             <div class="panel panel-default panel-contact">
                 <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-file-text-o"></i> Was this helpful?</h3>
+                    <h3 class="panel-title"><i class="fa fa-thumbs-o-up"></i> Was this helpful?</h3>
                 </div>
                 <div class="panel-body">
                     <div class="rw-ui-container"></div>
@@ -25,18 +24,10 @@ layout: default
             </div>
         </div>
         <div class="col-sm-6">
-                <div class="panel panel-default panel-contact">
+            {% include contact.html %}
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-file-text-o"></i> Email Us</h3>
-                    </div>
-                    <div class="panel-body">
-                        Want to talk to a human?
         </div>
     </div>
 </div>
-        </div>
-    </div>
-</content>
 
 <script>
     (function (d, t, e, m) {

_layouts/category.html

@@ -2,28 +2,13 @@
 layout: default
 ---
 
-<header>
 <div class="container">
-        <form action="/search/" method="get">
-            <div class="input-group">
-                <input type="search" class="form-control input-lg" placeholder="Type your problem here..." name="q">
-                <span class="input-group-btn">
-                    <button class="btn btn-lg btn-default" type="submit">Search</button>
-                </span>
-            </div>
-        </form>
-    </div>
-</header>
-<content>
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8">
     <h1 class="page-header">
         <i class="fa fa-folder-open"></i>
         {{page.title}}
     </h1>
-                <div class="panel panel-default panel-article">
+    <div class="row">
-                    <div class="panel-body">
+        <div class="col-md-8">
             <ol>
                 {% for article in site.articles %}
                 {% if article.categories contains page.title %}
@@ -32,19 +17,8 @@ layout: default
                 {% endfor %}
             </ol>
         </div>
-                </div>
-            </div>
         <div class="col-md-4">
-                <div class="panel panel-default panel-contact">
+            {% include contact.html %}
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-envelope"></i> Email Us</h3>
-                    </div>
-                    <div class="panel-body">
-                        Want to talk to a human?
-                        Email Us
         </div>
     </div>
 </div>
-        </div>
-    </div>
-</content>

_layouts/default.html

@@ -52,8 +52,22 @@
             </div>
         </div>
     </nav>
+    <header>
+        <div class="container">
+            <form action="/search/" method="get">
+                <div class="input-group">
+                    <input type="search" class="form-control input-lg" placeholder="Search the help center..." name="q">
+                    <span class="input-group-btn">
+                        <button class="btn btn-lg btn-default" type="submit">Search</button>
+                    </span>
+                </div>
+            </form>
+        </div>
+    </header>
 
+    <content>
         {{content}}
+    </content>
 
     <footer>
         <div class="container">

index.html

@@ -3,19 +3,7 @@ layout: default
 title: Help Center
 ---
 
-<header>
+
-    <div class="container">
-        <form action="/search/" method="get">
-            <div class="input-group">
-                <input type="search" class="form-control input-lg" placeholder="Type your problem here..." name="q">
-                <span class="input-group-btn">
-                    <button class="btn btn-lg btn-default" type="submit">Search</button>
-                </span>
-            </div>
-        </form>
-    </div>
-</header>
-<content>
 <div class="container">
     <div class="row">
         <div class="col-md-8">
@@ -68,4 +56,3 @@ title: Help Center
         </div>
     </div>
 </div>
-</content>

search/index.html

@@ -3,20 +3,7 @@ layout: default
 title: Search Results
 ---
 
-<header>
+
-    <div class="container">
-        <form action="/search/" method="get">
-            <div class="input-group">
-                <input type="search" id="search-box" class="form-control input-lg"
-                       placeholder="Type your problem here..." name="q">
-                <span class="input-group-btn">
-                    <button class="btn btn-lg btn-default" type="submit">Search</button>
-                </span>
-            </div>
-        </form>
-    </div>
-</header>
-<content>
 <div class="container">
     <div class="panel panel-default panel-articles">
         <div class="panel-heading">
@@ -27,7 +14,6 @@ title: Search Results
         </div>
     </div>
 </div>
-</content>
 
 <script src="../lib/lunr/lunr.js"></script>
 <script>