diff --git a/templates/archive-entry.html b/templates/archive-entry.html
index 9258f9c..2419209 100644
--- a/templates/archive-entry.html
+++ b/templates/archive-entry.html
@@ -13,11 +13,11 @@
             View Dashboard
         </a>
         <a class="be-gui-link"
-           title="Click to view '{{db-data.title}}'"
-           href="/view/archive/{{db-data.slug}}">
-            <img alt="New Archive Entry"
-	         src="/images/icons/view-entry.png">
-            View Entry
+           title="Click to edit '{{db-data.title}}'"
+           href="/edit/archive/{{db-data.slug}}">
+            <img alt="Edit Archive Entry"
+	         src="/images/icons/edit-entry.png">
+            Edit Entry
         </a>
         <a class="be-gui-link"
            title="Click to add a new archive entry"
@@ -60,7 +60,7 @@
     <div class="fe-article-body">
         <h1>{{db-data.title}}</h1>
         <p class="fe-hint">
-            Published: {{db-data.month}} {{db-data.year}}
+          {{db-data.month}} {{db-data.year}}
         </p>
         <p class="fe-hint">Keywords: {{ db-data.keywords | replace:, | with:" • " }}</p>
         {{data | safe}}
diff --git a/templates/page.html b/templates/page.html
index ea917f5..dc089c9 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -12,11 +12,11 @@
             View Dashboard
         </a>
         <a class="be-gui-link"
-           title="Click to view '{{db-data.title}}'"
-           href="/view/archive/{{db-data.slug}}">
-            <img alt="New Archive Entry"
-	         src="/images/icons/view-entry.png">
-            View Entry
+           title="Click to edit '{{db-data.title}}'"
+           href="/edit/page/{{db-data.slug}}">
+            <img alt="Edit Page"
+	         src="/images/icons/edit-entry.png">
+            Edit Page
         </a>
         <a class="be-gui-link"
            title="Click to add a new archive entry"