diff --git a/index.html b/index.html
index 5e070c0..ba68c99 100644
--- a/index.html
+++ b/index.html
@@ -3,12 +3,17 @@
     tabtitle: Home
 ---
 
-{% for post in site.posts %}
+{% for post in site.posts limit:5 %}
     <div id="posts">
         <h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
         <div class="" id="details">
             <div class="" id="date">Published: {{ post.pub }}</div>
-            <div class="" id="tags">Tagged: {{ post.tags }}</div>
+            <div class="" id="tags">
+                Tagged: 
+                {% for tag in post.tags %}
+                {% if forloop.last %} {{tag}}{% else %} {{tag}}, {% endif %}
+                {% endfor %}
+            </div>
         </div>
         <div id="desc">{{ post.short_desc }}</div>
     </div>