diff --git a/index.hbs b/index.hbs
index fba3446..8ffd650 100644
--- a/index.hbs
+++ b/index.hbs
@@ -22,7 +22,7 @@
     
     <article class="{{post_class}}">
         <header class="post-header">
-            <span class="post-meta"><time datetime="{{date published_at format='YYYY-MM-DD'}}">{{date published_at format='DD MMM YYYY'}}</time> in <a href="#">What I Learned Building...</a></span>
+            <span class="post-meta"><time datetime="{{date published_at format='YYYY-MM-DD'}}">{{date published_at format="DD MMM YYYY"}}</time> {{#if tags}}on {{tags}}{{/if}}</span>
             <h2 class="post-title"><a href="/{{slug}}">{{title}}</a></h2>
             
         </header>
diff --git a/post.hbs b/post.hbs
index 03ab5e9..1a5485e 100644
--- a/post.hbs
+++ b/post.hbs
@@ -16,7 +16,7 @@
         </header>
         
         {{! Everything below outputs content of the the post which has been published }}
-        <span class="post-meta"><time datetime="{{date published_at format='YYYY-MM-DD'}}">{{date published_at format='DD MMM YYYY'}}</time> on <a href="#">What I Learned Building...</a></span>
+        <span class="post-meta"><time datetime="{{date published_at format="YYYY-MM-DD"}}">{{date published_at format='DD MMM YYYY'}}</time> {{#if tags}}on {{tags}}{{/if}}</a></span>
 
         <h1 class="post-title">{{title}}</h1>