diff --git a/theme/templates/article.html b/theme/templates/article.html
index 024ddd3..b774bdb 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -12,7 +12,7 @@ article.title }}{% endif
 {% endblock content_header %}
 
 {% block content_body %}
-<article class="article-body">
+<div class="article-body">
   {% if article.content | length is eq(0) %}
   <div class="no-content">
     {% endif %}
@@ -32,5 +32,5 @@ article.title }}{% endif
   </div>
   {% endif %}
   <footer class="article-footer"><a href="/{{ article.save_as.split('/')[:-1] | join('/') }}/">&#8592; {{ article.category }}</a></footer>
-</article>
+</div>
 {% endblock content_body %}
\ No newline at end of file
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 1bc4547..1e0f272 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -10,8 +10,13 @@
 {% endblock content_header %}
 
 {% block content_body %}
-<article>{{ page.content }}</article>
+<div>
+{{ page.content }}
+</div>
 {% endblock content_body %}
 
 {% block content_footer %}
+{% if page.last_line is defined %}
+<p class="muted">{{ page.last_line }}</p>
+{% endif %}
 {% endblock content_footer %}
\ No newline at end of file