diff --git a/templates/archive.html b/templates/archive.html
index 1b50845..d2ab6dd 100644
--- a/templates/archive.html
+++ b/templates/archive.html
@@ -1,16 +1,29 @@
 {% extends "layouts/default.html" %}
-{% block title %}A list of the site's archive entries.{% endblock %}
+{% block title %}{{system-data.first.site-name}}: Archive Index{% endblock %}
 {% block content %}
-<h1>Archive</h1>
+<main class="fe-index">
+    <h1>Archive Index</h1>
 
-{% for entry in archive-entries %}
-<div>
-    <a href="/view/archive/{{entry.slug}}">
-	<img alt="{{entry.title}}"
-	     src="/storage/thumb/archive/{{entry.slug}}">
-      {{entry.title}}
-  </a>
-</div>
-{% endfor %}
+    <input type="text"
+           id="fe-search-filter"
+           placeholder="Filter Entries by typing here...">
 
+    <ul id="fe-search-filter-list">
+        {% for entry in archive-entries %}
+        <li class="fe-index-entry">
+            <a href="/view/archive/{{entry.slug}}">
+                {{entry.title}}
+            </a>
+            <p class="fe-hint">
+                Added to Archive:
+                {{ entry.created-at | date: ((:day 2) "/" (:month 2) "/" (:year 4)) }}
+            </p>
+            <p class="fe-hint">
+                Originally Published:
+                {{ entry.created-at | date: ((:day 2) "/" (:month 2) "/" (:year 4)) }}
+            </p>
+        </li>
+        {% endfor %}
+    </ul>
+</main>
 {% endblock %}