diff --git a/markupwiki/templates/markupwiki/edit_article.html b/markupwiki/templates/markupwiki/edit_article.html
index 75a5535..a755cb1 100644
--- a/markupwiki/templates/markupwiki/edit_article.html
+++ b/markupwiki/templates/markupwiki/edit_article.html
@@ -18,7 +18,9 @@
 {% block article_body %}
 <form method="POST" action=".">
     <ul>
-        {{ form.as_ul }}
+        <li>{{form.body}}</li>
+        <li>{{form.comment.label_tag}} {{ form.comment }} </li>
+        <li>{{form.body_markup_type.label_tag}} {{ form.body_markup_type }} </li>
     <li>
         <button class="submitBtn" type="submit">
             <span>Save Changes</span>
diff --git a/markupwiki/templates/markupwiki/history.html b/markupwiki/templates/markupwiki/history.html
index 25ecbb1..17b8512 100644
--- a/markupwiki/templates/markupwiki/history.html
+++ b/markupwiki/templates/markupwiki/history.html
@@ -17,6 +17,7 @@
     <th>Version</th>
     <th>Author</th>
     <th>Timestamp</th>
+    <th>Comment</th>
     <th>Compare From</th>
     <th>Compare To</th>
 </tr></thead>
@@ -33,6 +34,7 @@
     </a></td>
     <td>{{version.author}}</td>
     <td><a href="{{version.get_absolute_url}}">{{version.timestamp|date:"Y-m-d H:i:s"}}</a></td>
+    <td>{{version.comment|default:""}}</td>
     <td><input type="radio" name="from" value="{{version.number}}"></td>
     <td><input type="radio" name="to" value="{{version.number}}"></td>
 </tr>