diff --git a/amanuensis/server/auth/auth.login.jinja b/amanuensis/server/auth/auth.login.jinja
index f6b6ae2..a06dce7 100644
--- a/amanuensis/server/auth/auth.login.jinja
+++ b/amanuensis/server/auth/auth.login.jinja
@@ -3,21 +3,22 @@
 {% block header %}<h2>Amanuensis - Login</h2>{% endblock %}
 {% block login_status_attr %}style="display:none"{% endblock %}
 {% block main %}
+<section>
 <form action="" method="post" novalidate>
-	{{ form.hidden_tag() }}
-	<p>{{ form.username.label }}<br>{{ form.username(size=32) }}
-	{% for error in form.username.errors %}
-	<br><span style="color: #ff0000">{{ error }}</span>
-	{% endfor %}</p>
-	<p>{{ form.password.label }}<br>{{ form.password(size=32) }}
-	{% for error in form.password.errors %}
-	<br><span style="color: #ff0000">{{ error }}</span>
-	{% endfor %}</p>
-	<p>{{ form.remember }} {{ form.remember.label }}</p>
-	<p>{{ form.submit() }}</p>
+    {{ form.hidden_tag() }}
+    <p>{{ form.username.label }}<br>{{ form.username(size=32) }}
+    {% for error in form.username.errors %}
+    <br><span style="color: #ff0000">{{ error }}</span>
+    {% endfor %}</p>
+    <p>{{ form.password.label }}<br>{{ form.password(size=32) }}
+    {% for error in form.password.errors %}
+    <br><span style="color: #ff0000">{{ error }}</span>
+    {% endfor %}</p>
+    <p>{{ form.remember }} {{ form.remember.label }}</p>
+    <p>{{ form.submit() }}</p>
 </form>
 {% for message in get_flashed_messages() %}
 <span style="color: #ff0000">{{ message }}</span><br>
 {% endfor %}
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/home/home.admin.jinja b/amanuensis/server/home/home.admin.jinja
index 20ff0f2..ad85b95 100644
--- a/amanuensis/server/home/home.admin.jinja
+++ b/amanuensis/server/home/home.admin.jinja
@@ -9,6 +9,7 @@
 {% set template_sidebar_rows = [self.sb_home(), self.sb_create()] %}
 
 {% block main %}
+<section>
 <p>Users:</p>
 {% for user in userq.get_all(db) %}
 {{ macros.dashboard_user_item(user) }}
@@ -17,5 +18,5 @@
 {% for lexicon in lexiq.get_all(db) %}
 {{ macros.dashboard_lexicon_item(lexicon) }}
 {% endfor %}
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/home/home.root.jinja b/amanuensis/server/home/home.root.jinja
index 83d7f29..5aad068 100644
--- a/amanuensis/server/home/home.root.jinja
+++ b/amanuensis/server/home/home.root.jinja
@@ -4,6 +4,13 @@
 {% block header %}<h2>Amanuensis - Home</h2>{% endblock %}
 
 {% block main %}
+{% if current_user.is_site_admin %}
+<section>
+<a href="{{ url_for('home.admin') }}" style="display:block; text-align:center;">Admin dashboard</a>
+</section>
+{% endif %}
+
+<section>
 <h1>Welcome to Amanuensis!</h1>
 <p>Amanuensis is a hub for playing Lexicon, the encyclopedia RPG. Log in to access your Lexicon games. If you do not have an account, contact the administrator.</p>
 
@@ -37,13 +44,5 @@
 {% else %}
 <p>No public games available.</p>
 {% endif %}
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
-
-{% if current_user.is_site_admin %}
-{% block admin_dash %}
-<a href="{{ url_for('home.admin') }}" style="display:block; text-align:center;">Admin dashboard</a>
-{% endblock %}
-{% set template_content_blocks = [self.admin_dash()] + template_content_blocks %}
-{% endif %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/characters/characters.edit.jinja b/amanuensis/server/lexicon/characters/characters.edit.jinja
index b9693d7..aaceb44 100644
--- a/amanuensis/server/lexicon/characters/characters.edit.jinja
+++ b/amanuensis/server/lexicon/characters/characters.edit.jinja
@@ -2,6 +2,7 @@
 {% block title %}Edit {{ character.name }} | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
+<section>
 <form action="" method="post" novalidate>
     {{ form.hidden_tag() }}
     <p>
@@ -19,6 +20,5 @@
 {% for message in get_flashed_messages() %}
 <span style="color:#ff0000">{{ message }}</span><br>
 {% endfor %}
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/characters/characters.jinja b/amanuensis/server/lexicon/characters/characters.jinja
index 278324e..bb50ad5 100644
--- a/amanuensis/server/lexicon/characters/characters.jinja
+++ b/amanuensis/server/lexicon/characters/characters.jinja
@@ -3,6 +3,7 @@
 {% block title %}Character | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
+<section>
 <h1>Characters</h1>
 {% set players = memq.get_players_in_lexicon(db, g.lexicon.id)|list %}
 {% set characters = charq.get_in_lexicon(db, g.lexicon.id)|list %}
@@ -30,5 +31,5 @@
 </li>
 {% endfor %}
 </ul>
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/lexicon.article.jinja b/amanuensis/server/lexicon/lexicon.article.jinja
index 9fc42d7..5e38840 100644
--- a/amanuensis/server/lexicon/lexicon.article.jinja
+++ b/amanuensis/server/lexicon/lexicon.article.jinja
@@ -2,17 +2,15 @@
 {% block title %}{{ article.title }} | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
-
+<section>
 {% for message in get_flashed_messages() %}
 <span style="color:#ff0000">{{ message }}</span><br>
 {% endfor %}
 
 <h1>{{ article.title }}</h1>
 {{ article.html }}
-
-{% endblock %}
-
-{% block citations %}
+</section>
+<section>
 <p>
     {% for citation in article.cites %}
     <a href="{{ citation|articlelink }}">{{ citation }}</a>{% if not loop.last %} / {% endif %}
@@ -23,6 +21,5 @@
     <a href="{{ citation|articlelink }}">{{ citation }}</a>{% if not loop.last %} / {% endif %}
     {% endfor %}
 </p>
+</section>
 {% endblock %}
-
-{% set template_content_blocks = [self.main(), self.citations()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/lexicon.contents.jinja b/amanuensis/server/lexicon/lexicon.contents.jinja
index a61e87c..1415449 100644
--- a/amanuensis/server/lexicon/lexicon.contents.jinja
+++ b/amanuensis/server/lexicon/lexicon.contents.jinja
@@ -3,7 +3,7 @@
 {% block title %}Index | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
-
+<section>
 {% for message in get_flashed_messages() %}
 <span style="color:#ff0000">{{ message }}</span><br>
 {% endfor %}
@@ -20,6 +20,5 @@
 </ul>
 {% endif %}
 {% endfor %}
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/lexicon.join.jinja b/amanuensis/server/lexicon/lexicon.join.jinja
index cdd9b24..cf009fd 100644
--- a/amanuensis/server/lexicon/lexicon.join.jinja
+++ b/amanuensis/server/lexicon/lexicon.join.jinja
@@ -2,7 +2,7 @@
 {% block title %}Join | {{ g.lexicon.full_title }}{% endblock %}
 
 {% block main %}
-
+<section>
 <form id="lexicon-join" action="" method="post" novalidate>
     {{ form.hidden_tag() }}
     {% if g.lexicon.join_password %}
@@ -16,6 +16,5 @@
 {% for message in get_flashed_messages() %}
 <span style="color:#ff0000">{{ message }}</span><br>
 {% endfor %}
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/lexicon.rules.jinja b/amanuensis/server/lexicon/lexicon.rules.jinja
index 20fc070..932ad98 100644
--- a/amanuensis/server/lexicon/lexicon.rules.jinja
+++ b/amanuensis/server/lexicon/lexicon.rules.jinja
@@ -3,8 +3,7 @@
 {% block title %}Rules | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
-
+<section>
 Placeholder text
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/lexicon.statistics.jinja b/amanuensis/server/lexicon/lexicon.statistics.jinja
index e816653..3d3f6f5 100644
--- a/amanuensis/server/lexicon/lexicon.statistics.jinja
+++ b/amanuensis/server/lexicon/lexicon.statistics.jinja
@@ -3,8 +3,7 @@
 {% block title %}Session | {{ lexicon_title }}{% endblock %}
 
 {% block main %}
-
+<section>
 Placeholder text
-
+</section>
 {% endblock %}
-{% set template_content_blocks = [self.main()] %}
\ No newline at end of file
diff --git a/amanuensis/server/lexicon/settings/settings.jinja b/amanuensis/server/lexicon/settings/settings.jinja
index d143b98..bd1a52a 100644
--- a/amanuensis/server/lexicon/settings/settings.jinja
+++ b/amanuensis/server/lexicon/settings/settings.jinja
@@ -19,6 +19,7 @@
 {% endmacro %}
 
 {% block main %}
+<section>
 {% if current_membership.is_editor %}
 <ul class="unordered-tabs">
     <li>{{ settings_page_link("player", "Player Settings") }}</li>
@@ -172,6 +173,5 @@
 {% if page_name == "article" %}
     <h3>Article Requirements</h3>
 {% endif %}
+</section>
 {% endblock %}
-
-{% set template_content_blocks = [self.main()] %}
diff --git a/amanuensis/server/page.jinja b/amanuensis/server/page.jinja
index df4832e..02f7740 100644
--- a/amanuensis/server/page.jinja
+++ b/amanuensis/server/page.jinja
@@ -27,11 +27,7 @@
         </header>
         {% block sidebar %}{% endblock %}
         <article class="{% block content_class %}{% endblock %}">
-            {% if not template_content_blocks %}{% set template_content_blocks = [] %}{% endif %}
-            {% if not content_blocks %}{% set content_blocks = [] %}{% endif %}
-            {% for content_block in template_content_blocks + content_blocks -%}
-            <section>{{ content_block|safe }}</div>
-            {% endfor %}
+            {% block main %}{% endblock %}
         </article>
     </main>
 </body>