diff --git a/templates/user/edit-page.html b/templates/user/edit-page.html
index fed15c6..7e087cb 100644
--- a/templates/user/edit-page.html
+++ b/templates/user/edit-page.html
@@ -1,8 +1,40 @@
 {% extends "layouts/default.html" %}
 {% block title %}Edit: {{title}}{% endblock %}
 {% block content %}
+<div class="be-main">
 <h1>Edit Page</h1>
 
+<div class="be-quicklist">
+	<a class="be-gui-link"
+	   title="Click to view '{{db-data.title}}'"
+	   href="/view/page/{{db-data.slug}}">
+	    <img alt="View Page"
+		 src="/images/icons/view-entry.png">
+	    View Page
+	</a>
+	<a class="be-gui-link"
+	   title="Click to view all pages stored on the system"
+	   href="/user/pages">
+	    <img alt="Pages Index"
+		 src="/images/icons/index.png">
+	    Pages 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 create a new page"
+	   href="/create/page">
+	    <img alt="New Page"
+		 src="/images/icons/add-circle.png">
+	    Create Page
+	</a>
+</div>
+
 <script src="/js/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
 
 <script>
@@ -14,7 +46,7 @@
 	 'fullscreen', 'insertdatetime', 'media', 'save', 'table', 'help',
 	 'visualchars', 'wordcount', 'quickbars', 'pagebreak', 'nonbreaking',
 	 'importcss', 'directionality', 'codesample', 'code', 'autosave',
-	 'autoresize'
+	 /* 'autoresize' */
      ],
      toolbar: 'undo redo | save | formatpainter casechange blocks | bold italic backcolor | ' +
               'alignleft aligncenter alignright alignjustify | ' +
@@ -22,34 +54,80 @@
  });
 </script>
 
-<form action="/page/set-nav-menu" method="post">
-  <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-  <input required type="hidden" name="SLUG" value="{{db-data.slug}}">
-    <input type="checkbox" name="SHOW-IN-NAV"
+<form class="be-gui-form"
+      action="/page/set-nav-menu"
+      method="post">
+    <input required
+	   type="hidden"
+	   name="AUTHENTICITY-TOKEN"
+	   value="{{token}}">
+    <input required
+	   type="hidden"
+	   name="SLUG"
+	   value="{{db-data.slug}}">
+    <div class="be-gui-form-row">
+    <input type="checkbox"
+	   name="SHOW-IN-NAV"
 	   {% if db-data.enable-nav-menu == 1 %}
 	   checked
 	   {% endif %}
     >
-    <label>Include in Nav. Menu</label>
-    <input type="submit" value="Save Changes">
+    <label>Show in Nav. Menu</label>
+    <button class="be-gui-button-no-text"
+	    title="Click to save navigation menu setting for '{{db-data.title}}'"
+	    type="submit">
+	<img alt="Save nav. menu setting for{{db-data.title}}"
+	     src="/images/icons/save.png">
+    </button>
+    </div>
 </form>
 
-<form action="/rename/page" method="post">
-  <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-   <input required type="hidden" name="ID" value="{{db-data.id}}">
-    <input required type="hidden" name="SLUG" value="{{db-data.slug}}">
+<form class="be-gui-form"
+      action="/rename/page"
+      method="post">
+    <input required
+	   type="hidden"
+	   name="AUTHENTICITY-TOKEN"
+	   value="{{token}}">
+    <input required
+	   type="hidden"
+	   name="ID"
+	   value="{{db-data.id}}">
+    <input required
+	   type="hidden"
+	   name="SLUG"
+	   value="{{db-data.slug}}">
     <label>Title</label>
-    <input required type="text" name="NEW-TITLE" value="{{db-data.title}}">
-    <input type="submit" value="Rename Page">
+    <div class="be-gui-form-row">
+	<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 action="/edit/page" 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...">
+<form class="be-gui-form"
+      action="/edit/page"
+      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}}
     </textarea>
-    <!-- <input type="submit" value="Save Page"> -->
 </form>
+</div>
 {% endblock %}