diff --git a/templates/user/edit-archive.html b/templates/user/edit-archive.html
index b528680..0f76110 100644
--- a/templates/user/edit-archive.html
+++ b/templates/user/edit-archive.html
@@ -2,76 +2,76 @@
 {% block title %}Edit: {{db-data.title}}{% endblock %}
 {% block content %}
 <div class="be-main">
-    <h1>Edit Archive Entry</h1>
+  <h1>Edit Archive Entry</h1>
 
-    <div class="be-quicklist">
-	<a class="be-gui-link"
-	   title="Click to view your Dashboard"
-	   href="/dashboard">
-	    <img alt="Dashboard"
-		 src="/images/icons/dashboard.png">
-	    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
-	</a>
-	<a class="be-gui-link"
-	   title="Click to add a new archive entry"
-	   href="/create/archive-entry">
-	    <img alt="New Archive Entry"
-		 src="/images/icons/add-circle.png">
-	    Create Entry
-	</a>
-	<a class="be-gui-link"
-	   title="Click to view all archive entries stored on the system"
-	   href="/user/archive">
-	    <img alt="Archive Index"
-		 src="/images/icons/index.png">
-	    Archive Index
-	</a>
-	<a class="be-gui-link"
-	   title="Click to view files in Storage"
-	   href="/storage/manage">
-	    <img alt="Storage Index"
-		 src="/images/icons/index.png">
-	    Storage Index
-	</a>
-	<a class="be-gui-link"
-	   title="Click to view your Pages Index"
-	   href="/user/pages">
-	    <img alt="Pages Index"
-		 src="/images/icons/index.png">
-	    Pages Index
-	</a>
-    </div>
+  <div class="be-quicklist">
+    <a class="be-gui-link"
+       title="Click to view your Dashboard"
+       href="/dashboard">
+      <img alt="Dashboard"
+	   src="/images/icons/dashboard.png">
+      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
+    </a>
+    <a class="be-gui-link"
+       title="Click to add a new archive entry"
+       href="/create/archive-entry">
+      <img alt="New Archive Entry"
+	   src="/images/icons/add-circle.png">
+      Create Entry
+    </a>
+    <a class="be-gui-link"
+       title="Click to view all archive entries stored on the system"
+       href="/user/archive">
+      <img alt="Archive Index"
+	   src="/images/icons/index.png">
+      Archive Index
+    </a>
+    <a class="be-gui-link"
+       title="Click to view files in Storage"
+       href="/storage/manage">
+      <img alt="Storage Index"
+	   src="/images/icons/index.png">
+      Storage Index
+    </a>
+    <a class="be-gui-link"
+       title="Click to view your Pages Index"
+       href="/user/pages">
+      <img alt="Pages Index"
+	   src="/images/icons/index.png">
+      Pages Index
+    </a>
+  </div>
 
-<script src="/js/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
+  <script src="/js/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
 
-<script>
- tinymce.init({
-     selector: '#mytextarea',
-     plugins: [
-	 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap',
-	 'emoticons', 'preview', 'anchor', 'searchreplace', 'visualblocks',
-	 'fullscreen', 'insertdatetime', 'media', 'save', 'table', 'help',
-	 'visualchars', 'wordcount', 'quickbars', 'pagebreak', 'nonbreaking',
-	 'importcss', 'directionality', 'codesample', 'code', 'autosave',
-	 'autoresize'
-     ],
-     toolbar: 'undo redo | save | formatpainter casechange blocks | bold italic backcolor | ' +
-              'alignleft aligncenter alignright alignjustify | ' +
-              'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help'
- });
-</script>
+  <script>
+    tinymce.init({
+        selector: '#mytextarea',
+        plugins: [
+	    'advlist', 'autolink', 'lists', 'link', 'image', 'charmap',
+	    'emoticons', 'preview', 'anchor', 'searchreplace', 'visualblocks',
+	    'fullscreen', 'insertdatetime', 'media', 'save', 'table', 'help',
+	    'visualchars', 'wordcount', 'quickbars', 'pagebreak', 'nonbreaking',
+	    'importcss', 'directionality', 'codesample', 'code', 'autosave',
+	    'autoresize'
+        ],
+        toolbar: 'undo redo | save | formatpainter casechange blocks | bold italic backcolor | ' +
+            'alignleft aligncenter alignright alignjustify | ' +
+            'bullist numlist checklist outdent indent | removeformat | a11ycheck code table help'
+    });
+  </script>
 
-<form class="be-gui-form"
-      action="/edit/archive-thumbnail"
-      method="post"
-      enctype="multipart/form-data">
+  <form class="be-gui-form"
+        action="/edit/archive-thumbnail"
+        method="post"
+        enctype="multipart/form-data">
     <input required
 	   type="hidden"
 	   name="AUTHENTICITY-TOKEN"
@@ -81,50 +81,54 @@
 	   name="ARCHIVE-SLUG"
 	   value="{{db-data.slug}}">
     <div class="be-gui-form-row">
-	<img class="be-gui-form-thumbnail"
-	     alt="{{db-data.title}}"
-	     src="/storage/thumb/archive/{{db-data.slug}}">
-	<input required
-	       type="file"
-	       name="THUMBNAIL-FILE">
-	<button class="be-gui-button-no-text"
-		title="Click to update thumbnail for '{{db-data.title}}'"
-		type="submit">
-	    <img alt="Update thumbnail for {{db-data.title}}"
-		 src="/images/icons/save.png">
-	</button>
+      <img class="be-gui-form-thumbnail"
+	   alt="{{db-data.title}}"
+	   src="/storage/thumb/archive/{{db-data.slug}}">
+      <input required
+	     type="file"
+	     name="THUMBNAIL-FILE">
+      <button class="be-gui-button-no-text"
+	      title="Click to update thumbnail for '{{db-data.title}}'"
+	      type="submit">
+	<img alt="Update thumbnail for {{db-data.title}}"
+	     src="/images/icons/save.png">
+      </button>
     </div>
-</form>
+  </form>
 
-<form class="be-gui-form"
-      action="/rename/archive-entry"
-      method="post">
-    <input type="hidden"
+  <form class="be-gui-form"
+        action="/rename/archive-entry"
+        method="post">
+    <input required
+           type="hidden"
 	   name="AUTHENTICITY-TOKEN"
 	   value="{{token}}">
-    <input type="hidden"
+    <input required
+           type="hidden"
 	   name="ID"
 	   value="{{db-data.id}}">
-    <input type="hidden"
+    <input required
+           type="hidden"
 	   name="ARCHIVE-SLUG"
 	   value="{{db-data.slug}}">
     <label>Title</label>
     <div class="be-gui-form-row">
-	<input type="text"
-	       name="NEW-TITLE"
-	       value="{{db-data.title}}">
-	<button class="be-gui-button-no-text"
-		       title="Click to update the title for '{{db-data.title}}'"
-		       type="submit">
-	    <img alt="Rename {{db-data.title}}"
-		 src="/images/icons/save.png">
-	</button>
+      <input required
+             type="text"
+	     name="NEW-TITLE"
+	     value="{{db-data.title}}">
+      <button class="be-gui-button-no-text"
+	      title="Click to update the title for '{{db-data.title}}'"
+	      type="submit">
+	<img alt="Rename {{db-data.title}}"
+	     src="/images/icons/save.png">
+      </button>
     </div>
-</form>
+  </form>
 
-<form class="be-gui-form"
-      action="/edit/archive-keywords"
-      method="post">
+  <form class="be-gui-form"
+        action="/edit/archive-publish-date"
+        method="post">
     <input required
 	   type="hidden"
 	   name="AUTHENTICITY-TOKEN"
@@ -133,34 +137,86 @@
 	   type="hidden"
 	   name="ARCHIVE-SLUG"
 	   value="{{db-data.slug}}">
-    <label>Keywords</label>
+    <div class="be-gui-form-row">
+      <label>Month</label>
+      <select required name="MONTH">
+            <option value="{{db-data.month}}"
+                    selected>
+                {{db-data.month}}
+            </option>
+            <option>January</option>
+            <option>February</option>
+            <option>March</option>
+            <option>April</option>
+            <option>May</option>
+            <option>June</option>
+            <option>July</option>
+            <option>August</option>
+            <option>September</option>
+            <option>October</option>
+            <option>November</option>
+            <option>December</option>
+        </select>
+      <label>Year</label>
+      <input required
+             type="number"
+	     placeholder="The year the artwork was published..."
+	     name="YEAR"
+	     value="{{db-data.year}}">
+      <button class="be-gui-button-no-text"
+	      title="Click to update the publish date for '{{db-data.title}}'"
+	      type="submit">
+	<img alt="Update publish date"
+	     src="/images/icons/save.png">
+      </button>
+    </div>
+  </form>
+
+  <form class="be-gui-form"
+        action="/edit/archive-keywords"
+        method="post">
+    <input required
+	   type="hidden"
+	   name="AUTHENTICITY-TOKEN"
+	   value="{{token}}">
+    <input required
+	   type="hidden"
+	   name="ARCHIVE-SLUG"
+	   value="{{db-data.slug}}">
+    <label>Search Keywords</label>
     <p class="be-gui-form-hint">
-	Use a comma to seperate keywords (E.G. 'art,welding,green paint,metal').
-	Words seperated by a space and not a comma are marked as one keyword.
-	So, 'green paint' is one keyword not two in this example.
+      Use a comma to seperate keywords (E.G. 'art,welding,green paint,metal').
+      Words seperated by a space and not a comma are marked as one keyword.
+      So, 'green paint' is one keyword not two in this example.
     </p>
     <div class="be-gui-form-row">
-	<input type="text"
-	       placeholder="Example: art,welding,green paint,metal"
-	       name="NEW-KEYWORDS"
-	       value="{{db-data.keywords}}">
-	<button class="be-gui-button-no-text"
-		title="Click to update the keywords for '{{db-data.title}}'"
-		type="submit">
-	    <img alt="Update Keywords {{db-data.title}}"
-		 src="/images/icons/save.png">
-	</button>
+      <input type="text"
+	     placeholder="Example: art,welding,green paint,metal"
+	     name="NEW-KEYWORDS"
+	     value="{{db-data.keywords}}">
+      <button class="be-gui-button-no-text"
+	      title="Click to update the keywords for '{{db-data.title}}'"
+	      type="submit">
+	<img alt="Update Keywords {{db-data.title}}"
+	     src="/images/icons/save.png">
+      </button>
     </div>
-</form>
+  </form>
 
-<form action="/edit/archive" method="post">
-    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input required type="hidden" name="slug" value="{{db-data.slug}}">
-    <textarea name="PAGE-CONTENT" id="mytextarea"
+  <form action="/edit/archive" method="post">
+    <input required
+           type="hidden"
+           name="AUTHENTICITY-TOKEN"
+           value="{{token}}">
+    <input required
+           type="hidden"
+           name="slug"
+           value="{{db-data.slug}}">
+    <textarea name="PAGE-CONTENT"
+              id="mytextarea"
 	      placeholder="Enter page content...">
-    {{data}}
+      {{data}}
     </textarea>
-    <!-- <input type="submit" value="Save Page"> -->
-</form>
+  </form>
 </div>
 {% endblock %}