diff --git a/themes/varia/templates/index.html b/themes/varia/templates/index.html
index 65b0e7a096..a2fdc4d123 100644
--- a/themes/varia/templates/index.html
+++ b/themes/varia/templates/index.html
@@ -18,16 +18,19 @@
 <div id="post-list">
 
 {% for article in articles_page.object_list %}
-    {% if article.category %}
+    {% set thumb_size = '/thumb' %}
+    {% if article.category %}       
         {% if article.event_start %}
             {% set event_status = '' %}
-            {% set thumb_size = '/thumb' %}
             {% if article.event_start < article.date.now() %}
                 {% set event_status = ' past' %}
             {% endif %}
             {% if article.event_start >= article.date.now() %}
                 {% set event_status = ' current' %}
                 {% set thumb_size = '/thumb2x' %}
+            {% endif %}    
+            {% if article.category == 'article' %}
+                {% set thumb_size = '/thumb2x' %}
             {% endif %}
         {% endif %}
 
@@ -40,6 +43,8 @@
                     {{ article.event_start  | strftime('%d %B %Y') }}
                     <!-- {% set event_status = '' %} -->
                 </div>
+            {% else %}
+                <div class="event-details"></div>
             {% endif %}
             <div class="featured-image {{event_status}}">
                 {% if article.featured_image %}
@@ -66,18 +71,19 @@
         <div class="separator"><hr></div>
         <div class="post-info">
             {% if article.category %}
-            <div class="categories">
-                <span itemprop="articleSection">
-                    <a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
+                <span class="categories">
+                    <span itemprop="articleSection">
+                        <a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
+                    </span>
+                </span>
+            {% endif %} 
+            {% if article.tags %}
+                <span class="tags">
+                    relating to {% for tag in article.tags %}
+                    <span itemprop="keywords">
+                        <a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+                    </span> {% endfor %}
                 </span>
-            </div>
-            {% endif %} {% if article.tags %}
-            <div class="tags">
-                Tags: {% for tag in article.tags %}
-                <span itemprop="keywords">
-                    <a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
-                </span> {% endfor %}
-            </div>
             {% endif %}
         </div>
     </article>
diff --git a/themes/varia/templates/tag.html b/themes/varia/templates/tag.html
index e69de29bb2..aadd7a5d2a 100644
--- a/themes/varia/templates/tag.html
+++ b/themes/varia/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
\ No newline at end of file