diff --git a/bakerydemo/templates/base/form_page.html b/bakerydemo/templates/base/form_page.html
index 74f791a..f5a5b7e 100644
--- a/bakerydemo/templates/base/form_page.html
+++ b/bakerydemo/templates/base/form_page.html
@@ -1,15 +1,11 @@
+{% extends "base.html" %}
 {% load wagtailcore_tags %}
-<html>
-    <head>
-        <title>{{ page.title }}</title>
-    </head>
-    <body>
-        <h1>{{ page.title }}</h1>
-        {{ page.intro|richtext }}
-        <form action="{% pageurl page %}" method="POST">
-            {% csrf_token %}
-            {{ form.as_p }}
-            <input type="submit">
-        </form>
-    </body>
-</html>
+{% block content %}
+    {{ page.intro|richtext }}
+
+    <form action="{% pageurl page %}" method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit">
+    </form>
+{% endblock content %}
diff --git a/bakerydemo/templates/base/form_page_landing.html b/bakerydemo/templates/base/form_page_landing.html
index 6f5ccf6..5537eba 100644
--- a/bakerydemo/templates/base/form_page_landing.html
+++ b/bakerydemo/templates/base/form_page_landing.html
@@ -1,9 +1,6 @@
-<html>
-    <head>
-        <title>{{ page.title }}</title>
-    </head>
-    <body>
-        <h1>{{ page.title }}</h1>
-        <h2>Thanks for your submission!</h2>
-    </body>
-</html>
+{% extends "base.html" %}
+{% load wagtailcore_tags %}
+{% block content %}
+    <h1>{{ page.title }}</h1>
+    {{ page.thank_you_text|richtext }}
+{% endblock content %}
