diff --git a/markupwiki/templates/markupwiki/edit_article.html b/markupwiki/templates/markupwiki/edit_article.html
index 8d2c474..6424ed4 100644
--- a/markupwiki/templates/markupwiki/edit_article.html
+++ b/markupwiki/templates/markupwiki/edit_article.html
@@ -9,11 +9,21 @@
 {% endblock article_title %}
 
 {% block article_meta %}
+    {% if article %}
+        <a href="{% url view_article article.title %}">view article</a> |
+        <a href="{% url article_history article.title %}">view history</a>
+    {% endif %}
 {% endblock %}
 
 {% block article_body %}
 <form method="POST" action=".">
-    {{ form.as_ul }}
-    <input type="submit">
+    <ul>
+        {{ form.as_ul }}
+    <li>
+        <button class="submitBtn" type="submit">
+            <span>Post</span>
+        </button>
+    </li>
+    </ul>
 </form>
 {% endblock %}
diff --git a/markupwiki/templates/markupwiki/history.html b/markupwiki/templates/markupwiki/history.html
index c6792cb..6657527 100644
--- a/markupwiki/templates/markupwiki/history.html
+++ b/markupwiki/templates/markupwiki/history.html
@@ -4,18 +4,23 @@
 {{article.title}} [History]
 {% endblock %}
 
-{% block article_meta %} {% endblock %}
+{% block article_meta %}
+    <a href="{% url view_article article.title %}">view article</a>
+    {% if article.editable %}
+        <a href="{% url edit_article article.title %}">edit article</a> |
+    {% endif %}
+{% endblock %}
 
 {% block article_body %}
 <table>
-<tr>
+<thead> <tr>
     <th>Version</th>
     <th>Author</th>
     <th>Timestamp</th>
     <th>Compare From</th>
     <th>Compare To</th>
-</tr>
-
+</tr></thead>
+<tbody>
 <form action="{% url article_diff article.title %}" method="GET">
 {% for version in versions %}
 <tr>
@@ -32,8 +37,11 @@
     <td><input type="radio" name="to" value="{{version.number}}"></td>
 </tr>
 {% endfor %}
+</tbody>
 </table>
 
-<input type="submit">
+<button class="submitBtn" type="submit">
+    <span>Compare Selected Versions</span>
+</button>
 </form>
 {% endblock %}