diff --git a/notmyidea-cms/templates/archives.html b/notmyidea-cms/templates/archives.html
index 1644aff..5ba2c81 100644
--- a/notmyidea-cms/templates/archives.html
+++ b/notmyidea-cms/templates/archives.html
@@ -5,7 +5,7 @@
 
 <dl>
 {% for article in dates %}
-    <dt>{{ article.date.strftime('%a %d %B %Y') }}</dt>
+    <dt>{{ article.locale_date }}</dt>
     <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
 {% endfor %}
 </dl>
diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html
index 3ec41e1..c2535d2 100644
--- a/notmyidea-cms/templates/base.html
+++ b/notmyidea-cms/templates/base.html
@@ -31,11 +31,11 @@
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU != False %}
-                <li><a href="{{ SITEURL }}/index.html">Home</a></li>
                 {% for p in PAGES %}
                     <li {% if p == page %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
                 {% endfor %}
                 {% endif %}
+                <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
                 {#{% for cat, null in categories %}
                     <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}#}