diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index db664c343..3152a60d5 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -121,10 +121,6 @@
   }) }}
 {% endblock %}
 
-{% block content %}
-  {% block fullwidth_content %}{% endblock %}
-{% endblock %}
-
 {% block footer %}
   {% set meta_items = [
     {
diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html
index 137088d1d..9ed74ee0f 100644
--- a/app/templates/fullwidth_template.html
+++ b/app/templates/fullwidth_template.html
@@ -1,7 +1,8 @@
 {% extends "admin_template.html" %}
 
-{% block fullwidth_content %}
-  <main role="main">
-    {% block maincolumn_content %}{% endblock %}
+{% block main %}
+  {% block beforeContent %}{% endblock %}
+  <main class="govuk-main-wrapper {{ mainClasses }}" id="main-content" role="main">
+    {% block content %}{% endblock %}
   </main>
 {% endblock %}
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index 3d2eb417f..b0031c118 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -4,8 +4,8 @@
   {% block org_page_title %}{% endblock %} – {{ current_org.name }}
 {% endblock %}
 
-{% block fullwidth_content %}
-  <div id="content">
+{% block main %}
+  <div class="govuk-width-container">
     <div class="navigation-service">
       {% if current_user.platform_admin %}
         <a href="{{ url_for('.organisations') }}" class="navigation-organisation-link">All organisations</a>
@@ -19,10 +19,15 @@
       <div class="column-one-quarter">
         {% include "org_nav.html" %}
       </div>
-      <main role="main" class="column-three-quarters column-main">
-        {% include 'flash_messages.html' %}
-        {% block maincolumn_content %}{% endblock %}
-      </main>
+      <div class="column-three-quarters">
+        {% block beforeContent %}{% endblock %}
+        <main class="govuk-main-wrapper column-main" id="main-content" role="main" >
+          {% block content %}
+            {% include 'flash_messages.html' %}
+            {% block maincolumn_content %}{% endblock %}
+          {% endblock %}
+        </main>
+      </div>
     </div>
   </div>
 {% endblock %}
diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html
index 8d2a28077..42966327c 100644
--- a/app/templates/views/organisations/add-organisation.html
+++ b/app/templates/views/organisations/add-organisation.html
@@ -9,29 +9,32 @@
   New organisation
 {% endblock %}
 
-{% block fullwidth_content %}
-  <div id="content">
+{% block main %}
+  <div class="govuk-width-container">
     <div class="navigation-service">
       <a href="{{ url_for('.organisations') }}" class="navigation-service-back-to">All organisations</a>
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>
     </div>
 
-    <main role="main">
-      <div class="grid-row">
-        <div class="column-one-quarter">
-          &nbsp;
-        </div>
-        <div class="column-three-quarters">
-          {{ page_header('New organisation') }}
-          {% call form_wrapper() %}
-            {{textbox(form.name)}}
-            {{radios(form.organisation_type)}}
-            {{radios(form.crown_status)}}
-            {{ page_footer('Save') }}
-          {% endcall %}
-        </div>
+    <div class="grid-row">
+      <div class="column-one-quarter">
+        &nbsp;
       </div>
-    </main>
+      <div class="column-three-quarters">
+        <main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
+          {% block beforeContent %}{% endblock %}
+          {% block content %}
+            {{ page_header('New organisation') }}
+            {% call form_wrapper() %}
+              {{textbox(form.name)}}
+              {{radios(form.organisation_type)}}
+              {{radios(form.crown_status)}}
+              {{ page_footer('Save') }}
+            {% endcall %}
+          {% endblock %}
+        </main>
+      </div>
+    </div>
   </div>
 
 {% endblock %}
diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html
index a7706b189..6be932260 100644
--- a/app/templates/views/organisations/index.html
+++ b/app/templates/views/organisations/index.html
@@ -7,9 +7,10 @@
   All organisations
 {% endblock %}
 
-{% block fullwidth_content %}
+{% block beforeContent %}{% endblock %}
+
+{% block maincolumn_content %}
 
-  <div id="content">
     <div class="navigation-service">
       <div class="navigation-service-name">
         &nbsp;
@@ -17,47 +18,45 @@
       <a href="{{ url_for('main.choose_account') }}" class="navigation-service-switch">Switch service</a>
     </div>
 
-    <main role="main">
-      <div class="grid-row top-gutter-2-3">
+    <div class="grid-row top-gutter-2-3">
+      <div class="column-one-quarter">
+        <h1>
+          All organisations
+        </h1>
+      </div>
+      <div class="column-three-quarters">
+
+        {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
+
+        <nav class="browse-list">
+          <ul>
+            {% for org in organisations %}
+              <li class="browse-list-item">
+                <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
+                <p class="browse-list-hint">
+                  {{ org.count_of_live_services }}
+                  live service{% if org.count_of_live_services != 1 %}s{% endif %}
+                </p>
+                {% if not org.active %}
+                  <span class="table-field-status-default heading-medium">- archived</span>
+                {% endif %}
+              </li>
+            {% endfor %}
+          </ul>
+        </nav>
+
+      </div>
+    </div>
+    <div class="js-stick-at-bottom-when-scrolling">
+      <div class="grid-row">
         <div class="column-one-quarter">
-          <h1>
-            All organisations
-          </h1>
+          &nbsp;
         </div>
         <div class="column-three-quarters">
-
-          {{ live_search(target_selector='.browse-list-item', show=True, form=search_form, label='Search by name') }}
-
-          <nav class="browse-list">
-            <ul>
-              {% for org in organisations %}
-                <li class="browse-list-item">
-                  <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
-                  <p class="browse-list-hint">
-                    {{ org.count_of_live_services }}
-                    live service{% if org.count_of_live_services != 1 %}s{% endif %}
-                  </p>
-                  {% if not org.active %}
-                    <span class="table-field-status-default heading-medium">- archived</span>
-                  {% endif %}
-                </li>
-              {% endfor %}
-            </ul>
-          </nav>
-
+          <a href="{{ url_for('main.add_organisation') }}" class="button-secondary">New organisation</a>
         </div>
       </div>
-      <div class="js-stick-at-bottom-when-scrolling">
-        <div class="grid-row">
-          <div class="column-one-quarter">
-            &nbsp;
-          </div>
-          <div class="column-three-quarters">
-            <a href="{{ url_for('main.add_organisation') }}" class="button-secondary">New organisation</a>
-          </div>
-        </div>
-      </div>
-    </main>
+    </div>
   </div>
 
 {% endblock %}
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 41b3d1264..e78999d2d 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -8,7 +8,7 @@
   GOV.UK Notify
 {% endblock %}
 
-{% block maincolumn_content %}
+{% block content %}
 
   <div class="product-page-intro">
     <div class="product-page-intro-wrapper override-elements-content" id="content">
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index 523a17a08..41dc9b3fb 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -4,8 +4,8 @@
   {% block service_page_title %}{% endblock %} – {{ current_service.name }}
 {% endblock %}
 
-{% block fullwidth_content %}
-  <div id="content">
+{% block main %}
+  <div class="govuk-width-container">
     <div class="navigation-service">
       {% if current_service.organisation_id %}
         {% if current_user.platform_admin or
@@ -27,13 +27,18 @@
         {% include "main_nav.html" %}
       </div>
       {% if help %}
-        <main role="main" class="column-two-thirds column-main">
+        <div class="column-two-thirds column-main">
       {% else %}
-        <main role="main" class="column-three-quarters column-main">
+        <div class="column-three-quarters column-main">
       {% endif %}
-        {% include 'flash_messages.html' %}
-        {% block maincolumn_content %}{% endblock %}
-      </main>
+        {% block beforeContent %}{% endblock %}
+        <main class="govuk-main-wrapper column-main {{ mainClasses }}" id="main-content" role="main">
+        {% block content %}
+          {% include 'flash_messages.html' %}
+          {% block maincolumn_content %}{% endblock %}
+        {% endblock %}
+        </main>
+      </div>
     </div>
   </div>
 {% endblock %}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html
index cd4f318c5..74362fd87 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/withoutnav_template.html
@@ -1,15 +1,14 @@
 {% extends "admin_template.html" %}
 
-{% block fullwidth_content %}
-  <div id="content">
+{% block beforeContent %}
     {% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}
     <div class="navigation-service">
       <a href="{{ url_for('main.show_accounts_or_dashboard') }}" class="navigation-service-back-to">Back to {{ current_service.name }}</a>
     </div>
     {% endif %}
-    <main role="main">
-      {% include 'flash_messages.html' %}
-      {% block maincolumn_content %}{% endblock %}
-    </main>
-  </div>
+{% endblock %}
+
+{% block content %}
+    {% include 'flash_messages.html' %}
+    {% block maincolumn_content %}{% endblock %}
 {% endblock %}