diff --git a/theme/templates/article.html b/theme/templates/article.html
index 4bf3d63..6b3cc59 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -6,17 +6,15 @@ article.title }}{% endif
 
 
 {% block content_header %}
-<article>
-  <header>
-    <h1>{{ article.title }}</h1>
-  </header>
-  {% endblock content_header %}
+<header id="main-header">
+  <h1>{{ article.title }}</h1>
+</header>
+{% endblock content_header %}
 
-  {% block content_body %}
-  {{ article.content }}
-  {% endblock content_body %}
+{% block content_body %}
+<article>{{ article.content }}</article>
+{% endblock content_body %}
 
-  {% block content_footer %}
-  <footer>ISBN: Bla</footer>
-</article>
+{% block content_footer %}
+<footer>ISBN: Bla</footer>
 {% endblock content_footer %}
\ No newline at end of file
diff --git a/theme/templates/page.html b/theme/templates/page.html
index d8d7afe..1bc4547 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }} - {{ SITENAME }}{% endblock %}
-{% block metadesc %}{% if page.summary %}{{ page.summary|e }}{% else %}A Page in {{ SITETAG }}: {{ page.title }}{% endif
+{% block metadesc %}{% if page.summary %}{{ page.summary|e }}{% else %}{{ super() }}{% endif
 %}{% endblock %}
 
-
 {% block content_header %}
 <header id="main-header">
   <h1>{{ page.title }}</h1>