diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index c349a1c9c..cc11557c5 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -32,6 +32,13 @@ body.admin {
     height: auto;
   }
 
+  .top-bar-title {
+
+    h1 {
+      margin-bottom: 0;
+    }
+  }
+
   form {
 
     .button {
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index f7b0a2ac5..b2f4eb5d8 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,4 +1,4 @@
-<nav class="admin-sidebar" data-equalizer-watch>
+<div class="admin-sidebar" data-equalizer-watch>
   <ul id="admin_menu" data-accordion-menu>
 
     <li class="section-title">
@@ -119,4 +119,4 @@
       </ul>
     </li>
   </ul>
-</nav>
+</div>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index d8dfe9d23..5fa3bc58f 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -1,11 +1,11 @@
 <header>
-  <section class="top-links">
+  <div class="top-links">
     <div class="expanded row">
       <%= render 'shared/locale_switcher' %>
       <%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'],
                   root_path, class: "float-right back-web" %>
     </div>
-  </section>
+  </div>
 
   <div class="expanded row">
     <div class="top-bar">
@@ -19,11 +19,13 @@
 
       <div id="responsive-menu">
         <div class="top-bar-title">
-          <%= link_to admin_root_path, class: "hide-for-small-only" do %>
-            <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
-            <%= setting['org_name'] %>
-            &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
-          <% end %>
+          <h1>
+            <%= link_to admin_root_path, class: "hide-for-small-only" do %>
+              <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+              <%= setting['org_name'] %>
+              &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
+            <% end %>
+          </h1>
         </div>
 
         <div class="top-bar-right">
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index e5741086a..198bf3adf 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -30,7 +30,7 @@
         <div class="off-canvas-content" data-off-canvas-content>
           <%= render 'layouts/admin_header' %>
 
-          <main class="no-margin-top row no-max-width collapse" data-equalizer>
+          <div class="no-margin-top row no-max-width collapse" data-equalizer>
             <div class="small-12 medium-3 column">
 
               <div class="show-for-small-only">
@@ -46,7 +46,7 @@
               <%= render 'layouts/flash' %>
               <%= yield %>
             </div>
-          </main>
+          </div>
         </div>
       </div>
     </div>