diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig
index 654c912..4d9f911 100644
--- a/source/_layouts/base.html.twig
+++ b/source/_layouts/base.html.twig
@@ -1,13 +1,13 @@
-
+
{% include 'meta' %}
-
+
+
{% include 'banner' %}
{% block content_wrapper %}
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
new file mode 100644
index 0000000..9c11d90
--- /dev/null
+++ b/source/_layouts/default.html.twig
@@ -0,0 +1 @@
+{% extends 'base' %}
diff --git a/source/_layouts/front.html.twig b/source/_layouts/front.html.twig
deleted file mode 100644
index fdf8f67..0000000
--- a/source/_layouts/front.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends 'base' %}
-
-{% block body_classes 'tw-h-full tw-flex tw-flex-col' %}
diff --git a/source/_layouts/page.html.twig b/source/_layouts/page.html.twig
index ea9e129..c8a4428 100644
--- a/source/_layouts/page.html.twig
+++ b/source/_layouts/page.html.twig
@@ -1,11 +1,19 @@
{% extends 'base' %}
{% block content_wrapper %}
-
- {{ page.title }}
+
+
+
+ {% block title %}{{ page.title }}{% endblock %}
+
-
- {% block content %}{% endblock %}
+ {% block content_wrapper_inner %}
+
+ {% block content %}{% endblock %}
+
+ {% endblock %}
+
+ {% block content_bottom %}{% endblock %}
{% endblock %}
diff --git a/source/index.html.twig b/source/index.html.twig
index 74c661d..ec2ce79 100644
--- a/source/index.html.twig
+++ b/source/index.html.twig
@@ -1,5 +1,5 @@
---
-layout: front
+layout: default
twitter:
url: https://twitter.com/drupalcampbris
update_text: Session submissions are now open!