diff --git a/_layouts/blog_by_category.html b/_layouts/blog_by_category.html
deleted file mode 100644
index 3da3280..0000000
--- a/_layouts/blog_by_category.html
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
----
-
-<header id="post-header">
-    <h1 id="post-title">{{ page.category }}</h1>
-    <h4 id="post-subtitle">Articles by category</h4>
-</header>
-
-<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><div class="list-group">
-            {% 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><div class="list-group">
-                {% endif %}
-            {% endif %}
-      
-            <a href="{{ post.url }}/" class="list-group-item">
-                <h4 class="list-group-item-heading">{{ post.title }}</h4>
-            </a>
-
-            {% if forloop.last %}
-                </div>
-            {% endif %}
-        {% endfor %}
-    {% else %}
-        <p>There are no posts in this category.</p>
-    {% endif %}
-</div>
\ No newline at end of file
diff --git a/_layouts/post_by_category.html b/_layouts/post_by_category.html
new file mode 100644
index 0000000..5ea5564
--- /dev/null
+++ b/_layouts/post_by_category.html
@@ -0,0 +1,44 @@
+---
+layout: default
+---
+
+<article class="page">
+    <h1>{{site.data.categories[page.category].name}}</h1>
+
+    <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>
+</article>
\ No newline at end of file
diff --git a/_layouts/blog_by_tag.html b/_layouts/post_by_tag.html
similarity index 100%
rename from _layouts/blog_by_tag.html
rename to _layouts/post_by_tag.html
diff --git a/meta/category/general.md b/meta/category/general.md
index 59f8b56..01314d9 100644
--- a/meta/category/general.md
+++ b/meta/category/general.md
@@ -1,6 +1,8 @@
 ---
-layout: blog_by_category
+layout: page
 title: 'Articles by category: general'
 category: general
 permalink: /meta/category/general/
 ---
+
+## foobar
\ No newline at end of file