diff --git a/_layouts/post.html.org b/_layouts/post.html.org
deleted file mode 100644
index a129891..0000000
--- a/_layouts/post.html.org
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: default
----
-
-{% assign post = page %}
-
-<article class="post">
-  <h1>{{page.title}}</h1>
-
-  <p class='info'>      
-    {% if post.category %}
-      {% for site_category in site.data.categories %}
-        {% if site_category.slug == post.category %}
-          {% assign category = site_category %}
-        {% endif %}
-      {% endfor %}
-      {% if category %}
-        {% capture category_content %} in <a href="/meta/category/{{ category.slug }}/">{{ category.name }}</a>{% endcapture %}
-      {% endif %}
-    {% else %}
-      {% assign category_content = '' %}
-    {% endif %}
-
-    {% if post.tags.size > 0 %}
-      {% capture tags_content %} with tags {% endcapture %}
-      {% for post_tag in post.tags %}
-          {% for data_tag in site.data.tags %}
-            {% if data_tag.slug == post_tag %}
-              {% assign tag = data_tag %}
-            {% endif %}
-          {% endfor %}
-          {% if tag %}
-            {% capture tags_content_temp %}{{ tags_content }}<a href="/meta/tag/{{ tag.slug }}/">{{ tag.name }}</a>{% if forloop.last == false %}, {% endif %}{% endcapture %}
-            {% assign tags_content = tags_content_temp %}
-          {% endif %}
-      {% endfor %}
-    {% else %}
-      {% assign tags_content = '' %}
-    {% endif %}
-
-    <span>{{page.date | date: "%B %d, %Y" }}</span>
-    /
-    <span>by {{page.author}}</span>    
-    <br/>
-    <span>Posted {{ category_content }}{{ tags_content }}</span>
-  </p>
-
-  <hr/>
-  
-  <div class="entry">
-    {{ content }}
-  </div>
-
-  {% include disqus.html %}
-</article>
diff --git a/_layouts/post_by_category.html b/_layouts/post_by_category.html
index fe4dbae..cd9417c 100644
--- a/_layouts/post_by_category.html
+++ b/_layouts/post_by_category.html
@@ -2,43 +2,58 @@
 layout: default
 ---
 
-<article class="page">
-    <h1>{{page.title}}</h1>
+<!-- Post Header -->
+<header class="intro-header" style="background-image: url('{{ site.baseurl }}/{% if page.header-img %}{{ page.header-img }}{% else %}{{ site.header-img }}{% endif %}')">
 
-    <p class='info'>
-        <span>Articles by category</span>
-    </p>
-
-    <hr/>
-  
-    <div id="post-content">
-        {% if site.categories[page.category] %}
-            {% for post in site.categories[page.category] %}
-                {% capture post_year %}{{ post.date | date: '%Y' }}{% endcapture %}
-                {% if forloop.first %}
-                    <h3>{{ post_year }}</h3><ul>
-                {% endif %}
-          
-                {% if forloop.first == false %}
-                    {% assign previous_index = forloop.index0 | minus: 1 %}
-                    {% capture previous_post_year %}{{ site.categories[page.category][previous_index].date | date: '%Y' }}{% endcapture %}
-                    {% if post_year != previous_post_year %}
-                        </div><h3>{{ post_year }}</h3><ul>
-                    {% endif %}
-                {% endif %}
-          
-                <li>
-                    <a href="{{ post.url }}/" class="read-more">
-                        {{ post.title }}
-                    </a>
-                </li>
-
-                {% if forloop.last %}
-                    </ul>
-                {% endif %}
-            {% endfor %}
-        {% else %}
-            <p>There are no posts in this category.</p>
-        {% endif %}
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+                <div class="post-heading">
+                    <h1>{{ page.title }}</h1>
+                    <h2 class="subheading">Articles posted in {{ page.title }}</h2>
+                </div>
+            </div>
+        </div>
     </div>
-</article>
\ No newline at end of file
+</header>
+
+<article class="page">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+
+                {% if site.categories[page.category] %}
+                    {% for post in site.categories[page.category] %}
+                        {% capture post_year %}{{ post.date | date: '%Y' }}{% endcapture %}
+                        {% if forloop.first %}
+                            <h3>{{ post_year }}</h3><ul>
+                        {% endif %}
+                  
+                        {% if forloop.first == false %}
+                            {% assign previous_index = forloop.index0 | minus: 1 %}
+                            {% capture previous_post_year %}{{ site.categories[page.category][previous_index].date | date: '%Y' }}{% endcapture %}
+                            {% if post_year != previous_post_year %}
+                                </div><h3>{{ post_year }}</h3><ul>
+                            {% endif %}
+                        {% endif %}
+                  
+                        <li>
+                            <a href="{{ post.url }}/" class="read-more">
+                                {{ post.title }}
+                            </a>
+                        </li>
+
+                        {% if forloop.last %}
+                            </ul>
+                        {% endif %}
+                    {% endfor %}
+                {% else %}
+                    <p>There are no posts in this category.</p>
+                {% endif %}
+                
+           </div>
+        </div>
+    </div>
+</article>
+
+<hr>