diff --git a/_src/_assets/styl/comments.styl b/_src/_assets/styl/comments.styl
index 9e724c9a..d5262bd9 100644
--- a/_src/_assets/styl/comments.styl
+++ b/_src/_assets/styl/comments.styl
@@ -9,11 +9,9 @@
     font-size: $font-size-small
     font-style: italic
     color: $text-color-dimmed
-    margin-top: $line-height-computed*2
-    border-radius: $border-radius-base
 
     p
         margin-bottom: ($line-height-computed/2)
 
     .btn-wrap
-        height: 27px
\ No newline at end of file
+        height: 27px
diff --git a/_src/_assets/styl/content.styl b/_src/_assets/styl/content.styl
index a91e0b62..2ea9cf1e 100644
--- a/_src/_assets/styl/content.styl
+++ b/_src/_assets/styl/content.styl
@@ -74,12 +74,13 @@
     font-size: $font-size-small
 
 .byline,
-time,
-.tags
+.time,
+.tags,
+.categories
     @extend .textcenter
 
 .byline,
-time
+.time
     font-style: italic
 
 .byline
@@ -89,12 +90,17 @@ time
     .by
         display: block
 
-time
-    display: block
+.time
     color: $text-color-dimmed
 
-.tags
-    margin-top: $line-height-computed
+//
+// Categories & Tags
+//
+.categories
+    margin-bottom: 0
+
+.category
+    text-transform: capitalize
 
 .tag
     color: $text-color-dimmed
diff --git a/_src/_includes/entry_meta.html b/_src/_includes/entry_meta.html
index f80e577a..acfd32bd 100644
--- a/_src/_includes/entry_meta.html
+++ b/_src/_includes/entry_meta.html
@@ -1,4 +1,5 @@
 <footer class="entry-meta">
+	
 	<p class="byline author vcard source-org">
         <span class="by">by</span> <a class="fn" rel="author" href="/about/">
 			{% if page.author %}
@@ -9,15 +10,22 @@
 		</a>
     </p>
 
-     <time is="time-ago" class="pubdate" datetime="{{ page.date | date_to_xmlschema }}" pubdate{% if page.updated %} data-updated="true"{% endif %}>{{ page.date | date_to_string }}</time>
+	<p class="time">
+		<time is="time-ago" class="pubdate" datetime="{{ page.date | date_to_xmlschema }}" pubdate{% if page.updated %} data-updated="true"{% endif %}>{{ page.date | date_to_string }}</time>
+	    {% if page.updated %}
+		<br>updated <time is="time-ago" class="updated" datetime="{{ page.updated | date_to_xmlschema }}">{{ page.updated | date_to_string }}</time>
+	    {% endif %}
+	</p>
 
-    {% if page.updated %}
-      <time is="time-ago" class="updated" datetime="{{ page.updated | date_to_xmlschema }}">Updated {{ page.updated | date_to_string }}</time>
-    {% endif %}
+	<p class="categories">
+		{% for category in page.categories %}
+			<a class="category" href="/{{ category }}">{{ category }}</a>
+		{% endfor %}
+	</p>
 
 	<p class="tags">
 		{% for tag in page.tags %}
-			<a class="tag" href="/tag/{{ tag }}">{{ tag }}</a> 
+			<a class="tag" href="/tag/{{ tag }}">{{ tag }}</a>
 		{% endfor %}
 	</p>