diff --git a/pelican/themes/templates/base.html b/pelican/themes/templates/base.html
index 3f62c461..3bf37391 100644
--- a/pelican/themes/templates/base.html
+++ b/pelican/themes/templates/base.html
@@ -9,6 +9,11 @@
         <header id="banner" class="body">
                 <h1><a href="{{ BLOGURL }}">{{ BLOGNAME }} <strong>{{ BLOGSUBTITLE }}</strong></a></h1>
         </header><!-- /#banner -->
+        {% if categories %}<ul>
+        {% for category, articles in categories %}
+            <li><a href="category/{{category}}.html">{{ category }}</a></li> 
+        {% endfor %}
+        </ul> {% endif %}
         {% block content %}
         {% endblock %}
         <footer id="contentinfo" class="body">
diff --git a/pelican/themes/templates/category.html b/pelican/themes/templates/category.html
index 0935e413..4e6fd24e 100644
--- a/pelican/themes/templates/category.html
+++ b/pelican/themes/templates/category.html
@@ -1,10 +1,5 @@
-{% extends "base.html" %}
-{% block content %}
-Articles in the {{ category }} category.
-<ul>
-{% for article in articles %}
-    <li><a href="../{{ article.url }}">{{ article.title }}</a></li>
-{% endfor %}
-</ul>
+{% extends "index.html" %}
+{% block content_title %}
+<h2>Articles in the {{ category }} category</h2>
 {% endblock %}
 
diff --git a/pelican/themes/templates/index.html b/pelican/themes/templates/index.html
index 8c309191..6ca3ce8f 100644
--- a/pelican/themes/templates/index.html
+++ b/pelican/themes/templates/index.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 {% block content %}        
 <section id="content">
+{% block content_title %}
+<h2>All articles</h2>
+{% endblock %}
+
 <ol id="post-list">
 {% for article in articles %}        
         <li><article class="hentry">