diff --git a/templates/user/edit-archive.html b/templates/user/edit-archive.html
index b8ac1db..067d08b 100644
--- a/templates/user/edit-archive.html
+++ b/templates/user/edit-archive.html
@@ -1,7 +1,39 @@
 {% extends "layouts/default.html" %}
 {% block title %}Edit: {{db-data.title}}{% endblock %}
 {% block content %}
-<h1>Edit Archive</h1>
+<div class="be-main">
+    <h1>Edit Archive Entry</h1>
+
+    <div class="be-quicklist">
+	<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 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 add a new archive entry"
+	   href="/create/archive-entry">
+	    <img alt="New Archive Entry"
+		 src="/images/icons/add-circle.png">
+	    Create Entry
+	</a>
+    </div>
 
 <script src="/js/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
 
@@ -22,29 +54,89 @@
  });
 </script>
 
-<img alt="{{db-data.title}}" src="/storage/thumb/archive/{{db-data.slug}}">
-<form action="/edit/archive-thumbnail" method="post" enctype="multipart/form-data">
-    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input required type="hidden" name="ARCHIVE-SLUG" value="{{db-data.slug}}">
-    <input required type="file" name="THUMBNAIL-FILE">
-    <input type="submit" value="Change Thumbnail">
+<form class="be-gui-form"
+      action="/edit/archive-thumbnail"
+      method="post"
+      enctype="multipart/form-data">
+    <input required
+	   type="hidden"
+	   name="AUTHENTICITY-TOKEN"
+	   value="{{token}}">
+    <input required
+	   type="hidden"
+	   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>
+    </div>
 </form>
 
-<form action="/rename/archive-entry" method="post">
-    <input type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input type="hidden" name="ID" value="{{db-data.id}}">
-    <input  type="hidden" name="ARCHIVE-SLUG" value="{{db-data.slug}}">
+<form class="be-gui-form"
+      action="/rename/archive-entry"
+      method="post">
+    <input type="hidden"
+	   name="AUTHENTICITY-TOKEN"
+	   value="{{token}}">
+    <input type="hidden"
+	   name="ID"
+	   value="{{db-data.id}}">
+    <input type="hidden"
+	   name="ARCHIVE-SLUG"
+	   value="{{db-data.slug}}">
     <label>Title</label>
-    <input  type="text" name="NEW-TITLE" value="{{db-data.title}}">
-    <input type="submit" value="Rename Entry">
+    <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>
+    </div>
 </form>
 
-<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}}">
+<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>Keywords</label>
-    <input  type="text" name="NEW-KEYWORDS" value="{{db-data.keywords}}">
-    <input type="submit" value="Update Keywords">
+    <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.
+    </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>
+    </div>
 </form>
 
 <form action="/edit/archive" method="post">
@@ -56,4 +148,5 @@
     </textarea>
     <!-- <input type="submit" value="Save Page"> -->
 </form>
+</div>
 {% endblock %}