diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 87a62e934..311a712f7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -12,9 +12,10 @@
     .container
       #maincontainer
         - if content_for?(:breadcrumbs)
-          %ol.breadcrumb{ "aria-label" => "breadcrumb" }
-            %li.breadcrumb-item= link_to 'Home', root_path
-            = yield(:breadcrumbs)
+          %nav{ "aria-label" => "breadcrumb" }
+            %ol.breadcrumb
+              %li.breadcrumb-item= link_to 'Home', root_path
+              = yield(:breadcrumbs)
         - if content_for?(:buttonbar)
           = yield(:buttonbar)
 
@@ -22,7 +23,7 @@
           %small= yield(:subtitle)
 
         = render "shared/flash_messages", flash: flash
-        = yield
+        %main= yield
 
     %footer.page-footer.font-small.bg-dark.pt-4= render "layouts/footer"
     /