diff --git a/_includes/contact.html b/_includes/contact.html
new file mode 100644
index 00000000..18f07841
--- /dev/null
+++ b/_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>
\ No newline at end of file
diff --git a/_layouts/article.html b/_layouts/article.html
index dd2483ea..42728840 100644
--- a/_layouts/article.html
+++ b/_layouts/article.html
@@ -2,41 +2,32 @@
 layout: default
 ---
 
-<content>
-    <div class="container">
-        <h1 class="page-header">
-            <i class="fa fa-file-text-o"></i>
-            {{page.title}}
-        </h1>
-        <div class="panel panel-default panel-article">
-            <div class="panel-body">
-                {{content}}
-            </div>
-        </div>
-        <div class="row">
-            <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>
-                    </div>
-                    <div class="panel-body">
-                        <div class="rw-ui-container"></div>
-                    </div>
-                </div>
-            </div>
-            <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> Email Us</h3>
-                    </div>
-                    <div class="panel-body">
-                        Want to talk to a human?
-                    </div>
-                </div>
-            </div>
+<div class="container">
+    <h1 class="page-header">
+        <i class="fa fa-file-text-o"></i>
+        {{page.title}}
+    </h1>
+    <div class="panel panel-default panel-article">
+        <div class="panel-body">
+            {{content}}
         </div>
     </div>
-</content>
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="panel panel-default panel-contact">
+                <div class="panel-heading">
+                    <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>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-6">
+            {% include contact.html %}
+        </div>
+    </div>
+</div>
 
 <script>
     (function (d, t, e, m) {
diff --git a/_layouts/category.html b/_layouts/category.html
index 7103a037..f5ded418 100644
--- a/_layouts/category.html
+++ b/_layouts/category.html
@@ -2,49 +2,23 @@
 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="panel-body">
-                        <ol>
-                            {% for article in site.articles %}
-                            {% if article.categories contains page.title %}
-                            <li><a href="{{article.url}}">{{article.title}}</a></li>
-                            {% endif %}
-                            {% endfor %}
-                        </ol>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <div class="panel panel-default panel-contact">
-                    <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 class="container">
+    <h1 class="page-header">
+        <i class="fa fa-folder-open"></i>
+        {{page.title}}
+    </h1>
+    <div class="row">
+        <div class="col-md-8">
+            <ol>
+                {% for article in site.articles %}
+                {% if article.categories contains page.title %}
+                <li><a href="{{article.url}}">{{article.title}}</a></li>
+                {% endif %}
+                {% endfor %}
+            </ol>
+        </div>
+        <div class="col-md-4">
+            {% include contact.html %}
         </div>
     </div>
-</content>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 728a14a4..fc6a4d61 100644
--- a/_layouts/default.html
+++ b/_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}}
+    </content>
 
     <footer>
         <div class="container">
diff --git a/index.html b/index.html
index a3c05c42..6e2fe516 100644
--- a/index.html
+++ b/index.html
@@ -3,69 +3,56 @@ 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">
-                {% for category in site.categories %}
-                {% if category.featured == true %}
-                <div class="panel panel-default panel-articles">
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-folder-open"></i> {{category.title}}</h3>
-                    </div>
-                    <div class="panel-body">
-                        <ul>
-                            {% for article in site.articles %}
-                            {% if article.categories contains category.title and article.featured == true %}
-                            <li><a href="{{article.url}}">{{article.title}}</a></li>
-                            {% endif %}
-                            {% endfor %}
-                        </ul>
-                    </div>
+
+<div class="container">
+    <div class="row">
+        <div class="col-md-8">
+            {% for category in site.categories %}
+            {% if category.featured == true %}
+            <div class="panel panel-default panel-articles">
+                <div class="panel-heading">
+                    <h3 class="panel-title"><i class="fa fa-folder-open"></i> {{category.title}}</h3>
                 </div>
-                {% endif %}
-                {% endfor %}
-            </div>
-            <div class="col-md-4">
-                <div class="panel panel-default panel-articles">
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-list-alt"></i> Categories</h3>
-                    </div>
-                    <div class="panel-body small">
-                        <ul>
-                            {% for category in site.categories %}
-                            <li><a href="{{category.url}}">{{category.title}}</a></li>
-                            {% endfor %}
-                        </ul>
-                    </div>
+                <div class="panel-body">
+                    <ul>
+                        {% for article in site.articles %}
+                        {% if article.categories contains category.title and article.featured == true %}
+                        <li><a href="{{article.url}}">{{article.title}}</a></li>
+                        {% endif %}
+                        {% endfor %}
+                    </ul>
                 </div>
-                <div class="panel panel-default panel-articles">
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><i class="fa fa-star"></i> Popular</h3>
-                    </div>
-                    <div class="panel-body small">
-                        <ul>
-                            {% for article in site.articles %}
-                            {% if article.popular == true %}
-                            <li><a href="{{article.url}}">{{article.title}}</a></li>
-                            {% endif %}
-                            {% endfor %}
-                        </ul>
-                    </div>
+            </div>
+            {% endif %}
+            {% endfor %}
+        </div>
+        <div class="col-md-4">
+            <div class="panel panel-default panel-articles">
+                <div class="panel-heading">
+                    <h3 class="panel-title"><i class="fa fa-list-alt"></i> Categories</h3>
+                </div>
+                <div class="panel-body small">
+                    <ul>
+                        {% for category in site.categories %}
+                        <li><a href="{{category.url}}">{{category.title}}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+            <div class="panel panel-default panel-articles">
+                <div class="panel-heading">
+                    <h3 class="panel-title"><i class="fa fa-star"></i> Popular</h3>
+                </div>
+                <div class="panel-body small">
+                    <ul>
+                        {% for article in site.articles %}
+                        {% if article.popular == true %}
+                        <li><a href="{{article.url}}">{{article.title}}</a></li>
+                        {% endif %}
+                        {% endfor %}
+                    </ul>
                 </div>
             </div>
         </div>
     </div>
-</content>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/search/index.html b/search/index.html
index 309faaa8..85db881d 100644
--- a/search/index.html
+++ b/search/index.html
@@ -3,31 +3,17 @@ 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">
-                <h3 class="panel-title"><i class="fa fa-search"></i> {{page.title}} for "<span id="search-term"></span>"</h3>
-            </div>
-            <div class="panel-body">
-                <ol id="search-results"></ol>
-            </div>
+
+<div class="container">
+    <div class="panel panel-default panel-articles">
+        <div class="panel-heading">
+            <h3 class="panel-title"><i class="fa fa-search"></i> {{page.title}} for "<span id="search-term"></span>"</h3>
+        </div>
+        <div class="panel-body">
+            <ol id="search-results"></ol>
         </div>
     </div>
-</content>
+</div>
 
 <script src="../lib/lunr/lunr.js"></script>
 <script>