diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig
index 51217646a..59c9bf328 100644
--- a/source/_layouts/page.html.twig
+++ b/source/_layouts/page.html.twig
@@ -1,7 +1,9 @@
 {% extends "default" %}
 
 {% block content_wrapper %}
-    <h1>{{ page.title }}</h1>
+    <div>
+        <h1>{{ page.title }}</h1>
 
-    {{ parent() }}
+        {{ parent() }}
+    </div>
 {% endblock %}
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index b9b6e07a8..f0e48e9a6 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -1,6 +1,6 @@
 {% extends 'page' %}
 
-{% block body %}
+{% block content_wrapper %}
     {{ parent() }}
 
     {% include 'about-author' %}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index 9784e3aa8..aeb7cd95b 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -1,6 +1,6 @@
 {% extends "page.html.twig" %}
 
-{% block body %}
+{% block content_wrapper %}
     {{ parent() }}
 
     {% include 'talk/slides' with {
diff --git a/source/_pages/index.md b/source/_pages/index.md
index 03a15c90a..30a247f30 100644
--- a/source/_pages/index.md
+++ b/source/_pages/index.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 title: Home
 permalink: /
 ---