diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index ebc1d29cc..6c2e71f13 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -71,9 +71,7 @@
 {% set homepage_url = url_for('main.show_all_services_or_dashboard') %}
 
 {% block content %}
-  <div id="content">
-    {% block fullwidth_content %}{% endblock %}
-  </div>
+  {% block fullwidth_content %}{% endblock %}
 {% endblock %}
 
 {% block footer_top %}
diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html
new file mode 100644
index 000000000..137088d1d
--- /dev/null
+++ b/app/templates/fullwidth_template.html
@@ -0,0 +1,7 @@
+{% extends "admin_template.html" %}
+
+{% block fullwidth_content %}
+  <main role="main">
+    {% block maincolumn_content %}{% endblock %}
+  </main>
+{% endblock %}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 44e784b89..b23dfbd82 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -1,7 +1,7 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/phone.html" import phone %}
 
-{% extends "withoutnav_template.html" %}
+{% extends "fullwidth_template.html" %}
 
 {% block page_title %}
   GOV.UK Notify
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index b72d1f6b7..7c4c44223 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -1,19 +1,21 @@
 {% extends "admin_template.html" %}
 
 {% block fullwidth_content %}
-  <div class="navigation-service">
-    <h2 class="navigation-service-name">
-      {{ current_service.name }}
-    </h2>
-    <a href="{{ url_for('main.choose_service') }}" class="navigation-service-switch">Switch service</a>
-  </div>
-  <div class="grid-row">
-    <div class="column-one-third">
-      {% include "main_nav.html" %}
+  <div id="content">
+    <div class="navigation-service">
+      <h2 class="navigation-service-name">
+        {{ current_service.name }}
+      </h2>
+      <a href="{{ url_for('main.choose_service') }}" class="navigation-service-switch">Switch service</a>
+    </div>
+    <div class="grid-row">
+      <div class="column-one-third">
+        {% include "main_nav.html" %}
+      </div>
+      <main role="main" class="column-two-thirds column-main">
+        {% include 'flash_messages.html' %}
+        {% block maincolumn_content %}{% endblock %}
+      </main>
     </div>
-    <main role="main" class="column-two-thirds column-main">
-      {% include 'flash_messages.html' %}
-      {% block maincolumn_content %}{% endblock %}
-    </main>
   </div>
 {% endblock %}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html
index fad322c73..2da0812e6 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/withoutnav_template.html
@@ -1,8 +1,10 @@
 {% extends "admin_template.html" %}
 
 {% block fullwidth_content %}
-  <main role="main">
-    {% include 'flash_messages.html' %}
-    {% block maincolumn_content %}{% endblock %}
-  </main>
+  <div id="content">
+    <main role="main">
+      {% include 'flash_messages.html' %}
+      {% block maincolumn_content %}{% endblock %}
+    </main>
+  </div>
 {% endblock %}