diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 9624ca741..49bfd2bf2 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -63,9 +63,9 @@
 {% endif %}
 
 {% block content %}
-  <main id="content" role="main" class="page-container">
+  <div id="content">
     {% block fullwidth_content %}{% endblock %}
-  </main>
+  </div>
 {% endblock %}
 
 {% block body_end %}
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index d981762a1..caf0aa651 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -5,9 +5,9 @@
     <div class="column-one-third">
       {% include "main_nav.html" %}
     </div>
-    <div class="column-two-thirds column-main">
+    <main role="main" class="column-two-thirds column-main">
       {% include 'flash_messages.html' %}
       {% block maincolumn_content %}{% endblock %}
-    </div>
+    </main>
   </div>
 {% endblock %}
diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html
index 82a6b2758..fad322c73 100644
--- a/app/templates/withoutnav_template.html
+++ b/app/templates/withoutnav_template.html
@@ -1,6 +1,8 @@
 {% extends "admin_template.html" %}
 
 {% block fullwidth_content %}
-  {% include 'flash_messages.html' %}
-  {% block maincolumn_content %}{% endblock %}
+  <main role="main">
+    {% include 'flash_messages.html' %}
+    {% block maincolumn_content %}{% endblock %}
+  </main>
 {% endblock %}