diff --git a/templates/user/archive.html b/templates/user/archive.html
index e64a27f..cde640c 100644
--- a/templates/user/archive.html
+++ b/templates/user/archive.html
@@ -1,18 +1,58 @@
 {% extends "layouts/default.html" %}
 {% block title %}Manage the site's archive.{% endblock %}
 {% block content %}
-<h1>Archive</h1>
-{% for entry in archive-entries %}
-<div>
-  <a href="/view/archive/{{entry.slug}}">{{entry.title}}</a>
-  <a href="/edit/archive/{{entry.slug}}">Edit</a>
-  {% if roles.administrator %}
-  <form action="/archive/delete/entry" method="post">
-    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input required type="hidden" name="slug" value="{{entry.slug}}">
-    <input type="submit" value="Delete">
-  </form>
-  {% endif %}
+<div class="be-main">
+    <div  class="be-dashboard-section">
+	<h1>Archive Index</h1>
+	<div class="be-section-controls">
+	    <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>
+	<div class="be-section-entries">
+	    {% for entry in archive-entries %}
+	    <div class="be-section-entry">
+		<div class="be-section-image-title">
+		    <img alt="{{entry.title}}"
+			 src="/storage/thumb/archive/{{entry.slug}}">
+		    <p>{{entry.title}}</p>
+		</div>
+		<div class="be-entry-controls">
+		    <a class="be-gui-link-no-text"
+		       href="/view/archive/{{entry.slug}}">
+			<img alt="{{entry.title}}"
+			     src="/images/icons/view-entry.png">
+		    </a>
+		    <a class="be-gui-link-no-text"
+		       href="/edit/archive/{{entry.slug}}">
+			<img alt="{{entry.title}}"
+			     src="/images/icons/edit-entry.png">
+		    </a>
+		    {% if roles.administrator %}
+		    <form action="/archive/delete/entry"
+			  method="post">
+			<input required type="hidden"
+			       name="AUTHENTICITY-TOKEN"
+			       value="{{token}}">
+			<input required type="hidden"
+			       name="slug"
+			       value="{{entry.slug}}">
+			<button class="be-gui-button-no-text"
+				title="Click to delete '{{entry.title}}'"
+				type="submit">
+			    <img alt="Rename {{entry.title}}"
+				 src="/images/icons/delete-entry.png">
+			</button>
+		    </form>
+		    {% endif %}
+		</div>
+	    </div>
+	    {% endfor %}
+	</div>
+    </div>    
 </div>
-{% endfor %}
 {% endblock %}
diff --git a/templates/user/pages.html b/templates/user/pages.html
index 7fffe69..67611c7 100644
--- a/templates/user/pages.html
+++ b/templates/user/pages.html
@@ -1,21 +1,58 @@
 {% extends "layouts/default.html" %}
 {% block title %}A list of the site's pages.{% endblock %}
 {% block content %}
-<h1>Pages</h1>
-{% for page in pages %}
-{% if page.can-delete == 1 %}
-<div>
-  <a href="/view/page/{{page.slug}}">{{page.title}}</a>
-  <a href="/edit/page/{{page.slug}}">Edit</a>
-  {% if roles.administrator %}
-  <form action="/page/delete" method="post">
-    <input required type="hidden" name="AUTHENTICITY-TOKEN" value="{{token}}">
-    <input required type="hidden" name="slug" value="{{page.slug}}">
-    <input type="submit" value="Delete">
-  </form>
-  {% endif %}
+<div class="be-main">
+    <div  class="be-dashboard-section">
+	<h1>Pages Index</h1>
+	<div class="be-section-controls">
+	    <a class="be-gui-link"
+	       title="Click to create a new page"
+	       href="/create/page">
+		<img alt="Create New Page"
+		     src="/images/icons/add-circle.png">
+		Add Page
+	    </a>
+	</div>
+	<div class="be-section-entries">
+	    {% for page in pages %}
+	    {% if page.can-delete == 1 %}
+	    <div class="be-section-entry">
+		<p>{{page.title}}</p>
+		<div class="be-entry-controls">
+		    <a class="be-gui-link-no-text"
+		       title="Click to view '{{page.title}}'"
+		       href="/view/page/{{page.slug}}">
+			<img alt="{{page.title}}"
+			     src="/images/icons/view-entry.png">
+		    </a>
+		    <a class="be-gui-link-no-text"
+		       href="/edit/page/{{page.slug}}">
+			<img alt="{{entry.title}}"
+			     src="/images/icons/edit-entry.png">
+		    </a>
+		    {% if roles.administrator %}
+		    <form action="/page/delete" method="post">
+			<input required
+			       type="hidden"
+			       name="AUTHENTICITY-TOKEN"
+			       value="{{token}}">
+			<input required
+			       type="hidden"
+			       name="slug"
+			       value="{{page.slug}}">
+			<button class="be-gui-button-no-text"
+				title="Click to delete '{{entry.title}}'"
+				type="submit">
+			    <img alt="Rename {{entry.title}}"
+				 src="/images/icons/delete-entry.png">
+			</button>
+		    </form>
+		    {% endif %}
+		</div>
+	    </div>
+	    {% endif %}
+	    {% endfor %}
+	</div>
+    </div>
 </div>
-{% endif %}
-{% endfor %}
-
 {% endblock %}