diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
new file mode 100644
index 000000000..9671f3ca3
--- /dev/null
+++ b/source/_layouts/base.html.twig
@@ -0,0 +1,23 @@
+{% extends 'app' %}
+
+{% block body %}
+    <div class="min-h-screen font-sans text-base font-light text-gray-900 md:text-lg dark:bg-gray-900 dark:text-white">
+        <a class="sr-only focus:not-sr-only" href="#main-content">Skip to main content</a>
+
+        {% include 'navbar' %}
+
+        <div class="max-w-2xl px-4 py-16 mx-auto">
+            <div id="main-content">
+                <h1 class="text-xl font-bold md:text-2xl">{{ page.title }}</h1>
+
+                <div class="mt-4">
+                    {% block content_wrapper %}
+                        {% block content %}{% endblock %}
+                    {% endblock %}
+                </div>
+            </div>
+
+            {% include 'footer' %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
deleted file mode 100644
index 559484dde..000000000
--- a/source/_layouts/default.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'app' %}
-
-{% block body %}
-    <div class="font-sans text-base font-light text-gray-900 md:text-lg dark:bg-gray-900 dark:text-white">
-        <a class="sr-only focus:not-sr-only" href="#main-content">Skip to main content</a>
-
-        {% include 'navbar' %}
-
-        <div class="max-w-2xl px-4 py-16 mx-auto">
-            <div id="main-content">
-                {% block content_wrapper %}
-                    {% block content %}{% endblock %}
-                {% endblock %}
-            </div>
-
-            {% include 'footer' %}
-        </div>
-    </div>
-{% endblock %}
diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig
index 02b111534..9c11d90b6 100644
--- a/source/_layouts/page.html.twig
+++ b/source/_layouts/page.html.twig
@@ -1,11 +1 @@
-{% extends "default" %}
-
-{% block content_wrapper %}
-    <div>
-        <h1 class="text-xl font-bold md:text-2xl">{{ page.title }}</h1>
-
-        <div class="mt-4">
-            {{ parent() }}
-        </div>
-    </div>
-{% endblock %}
+{% extends 'base' %}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index f0e48e9a6..ba1ff8b5e 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -1,4 +1,4 @@
-{% extends 'page' %}
+{% extends 'base' %}
 
 {% block content_wrapper %}
     {{ parent() }}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index aeb7cd95b..159a03e3c 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -1,4 +1,4 @@
-{% extends "page.html.twig" %}
+{% extends 'base' %}
 
 {% block content_wrapper %}
     {{ parent() }}
diff --git a/source/_partials/about-author.html.twig b/source/_partials/about-author.html.twig
index 6a2c06c50..597890de3 100644
--- a/source/_partials/about-author.html.twig
+++ b/source/_partials/about-author.html.twig
@@ -13,4 +13,4 @@
       </p>
     </div>
   </div>
-</div>
+</section>