diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 0bf1fd9f0..d34195915 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -17,32 +17,33 @@
     <%= render 'layouts/admin_header' %>
 
     <div class="row expanded">
+      <main>
+        <div class="small-12 medium-3 column">
+          <%= side_menu %>
+        </div>
 
-      <div class="small-12 medium-3 column">
-        <%= side_menu %>
-      </div>
+        <div class="admin-content small-12 medium-9 column">
+          <% if notice %>
+            <div data-alert class="callout success" data-closable>
+              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+                <span aria-hidden="true">&times;</span>
+              </button>
+              <%= notice %>
+            </div>
+          <% end %>
 
-      <div class="admin-content small-12 medium-9 column">
-        <% if notice %>
-          <div data-alert class="callout success" data-closable>
-            <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-              <span aria-hidden="true">&times;</span>
-            </button>
-            <%= notice %>
-          </div>
-        <% end %>
+          <% if alert %>
+            <div data-alert class="callout alert" data-closable>
+              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+                <span aria-hidden="true">&times;</span>
+              </button>
+              <%= alert %>
+            </div>
+          <% end %>
 
-        <% if alert %>
-          <div data-alert class="callout alert" data-closable>
-            <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-              <span aria-hidden="true">&times;</span>
-            </button>
-            <%= alert %>
-          </div>
-        <% end %>
-
-        <%= yield %>
-      </div>
+          <%= yield %>
+        </div>
+      </main>
     </div>
   </body>
 </html>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 73f446de2..0296073db 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -25,27 +25,29 @@
       </div>
 
       <div class="row auth">
-        <div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom">
-          <% if notice %>
-            <div data-alert class="callout success" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= notice %>
-            </div>
-          <% end %>
+        <main>
+          <div class="small-12 medium-8 large-5 column small-centered panel padding margin-bottom">
+            <% if notice %>
+              <div data-alert class="callout success" data-closable>
+                <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+                  <span aria-hidden="true">&times;</span>
+                </button>
+                <%= notice %>
+              </div>
+            <% end %>
 
-          <% if alert %>
-            <div data-alert class="callout warning" data-closable>
-              <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
-                <span aria-hidden="true">&times;</span>
-              </button>
-              <%= alert %>
-            </div>
-          <% end %>
+            <% if alert %>
+              <div data-alert class="callout warning" data-closable>
+                <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+                  <span aria-hidden="true">&times;</span>
+                </button>
+                <%= alert %>
+              </div>
+            <% end %>
 
-          <%= yield %>
-        </div>
+            <%= yield %>
+          </div>
+        </main>
       </div>
       <div class="push"></div>
     </div>