diff --git a/themes/waterspill-en/static/images/feed-icon-28x28.png b/themes/waterspill-en/static/images/feed-icon-28x28.png
new file mode 100644
index 0000000..d64c669
Binary files /dev/null and b/themes/waterspill-en/static/images/feed-icon-28x28.png differ
diff --git a/themes/waterspill-en/templates/base.html b/themes/waterspill-en/templates/base.html
index 069d610..e818729 100644
--- a/themes/waterspill-en/templates/base.html
+++ b/themes/waterspill-en/templates/base.html
@@ -40,7 +40,7 @@
         {% for item in AFTER_MENU %}
           <li><a href="{{ item.url }}">{{ item.name }}</li>
         {% endfor %}
-        
+        <li><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate"><img src="/blog/theme/images/feed-icon-28x28.png" /></li>
     </ul>
   
   </div><!-- end #topMenu -->
@@ -114,10 +114,8 @@
     <div class="archives">
       <h2>Archives of {{ SITENAME }}</h2>
       {% for article in dates %}
-      {% if loop.index > 1 %}
         <dt>{{ article.locale_date }}</dt>
           <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
-          {% endif %}
       {% endfor %}
     </div>
     {% endblock %}
diff --git a/themes/waterspill-en/templates/category.html b/themes/waterspill-en/templates/category.html
index 56f8e93..91899a2 100644
--- a/themes/waterspill-en/templates/category.html
+++ b/themes/waterspill-en/templates/category.html
@@ -1,2 +1,14 @@
 {% extends "index.html" %}
 {% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
+{% block content %} 
+  {% if articles %}
+    {% for article in articles %}        
+        <div class="blogItem">
+        <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+        <h3>{{ article.locale_date }}</h3>
+        {{ article.content }}	
+        <h3 class="blogMeta">{% if not SUPPRESS_ITEM_CATEGORIES %}Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %} | {% if article.tags %} Tags: {% for tag in article.tags %} <span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% if not loop.last %} / {% endif %} </span> {% endfor %}</h3>{% endif %}</div>
+    {% endfor %}
+{% endif %}
+{% endblock content %}
+{% block archives %} {% endblock %}
diff --git a/themes/waterspill-en/templates/index.html b/themes/waterspill-en/templates/index.html
index 6d351ec..80de2b2 100644
--- a/themes/waterspill-en/templates/index.html
+++ b/themes/waterspill-en/templates/index.html
@@ -3,7 +3,7 @@
 {% block content %} 
   {% if articles %}
     {% for article in articles %}        
-      {% if loop.index <= 1 %}
+      {% if loop.index <= 3 %}
         <div class="blogItem">
         <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
         <h3>{{ article.locale_date }}</h3>
diff --git a/themes/waterspill-en/templates/page.html b/themes/waterspill-en/templates/page.html
index 9812e31..0f8f781 100644
--- a/themes/waterspill-en/templates/page.html
+++ b/themes/waterspill-en/templates/page.html
@@ -13,3 +13,4 @@
 </div>
 
 {% endblock %}
+{% block archives %} {% endblock %}
diff --git a/themes/waterspill-en/templates/tag.html b/themes/waterspill-en/templates/tag.html
index e33255d..7165ac6 100644
--- a/themes/waterspill-en/templates/tag.html
+++ b/themes/waterspill-en/templates/tag.html
@@ -1,4 +1,14 @@
 {% extends "index.html" %}
 {% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
-{% block archives %}{% endblock %}
+{% block content %} 
+  {% if articles %}
+    {% for article in articles %}        
+        <div class="blogItem">
+        <h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
+        <h3>{{ article.locale_date }}</h3>
+        {{ article.content }}	
+        <h3 class="blogMeta">{% if not SUPPRESS_ITEM_CATEGORIES %}Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %} | {% if article.tags %} Tags: {% for tag in article.tags %} <span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% if not loop.last %} / {% endif %} </span> {% endfor %}</h3>{% endif %}</div>
+    {% endfor %}
+{% endif %}
+{% endblock content %}