diff --git a/_layouts/default.html b/_layouts/default.html
index ca98a06..c6fd128 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -26,99 +26,95 @@ layout: table_wrappers
     </symbol>
   </svg>
 
-  <div class="page-wrap">
-    <div class="side-bar">
-      <div class="site-header">
-        <a href="{{ '/' | absolute_url }}" class="site-title lh-tight">{% include title.html %}</a>
-        <a href="#" id="menu-button" class="site-button">
-          <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#menu"></use></svg>
-        </a>
-      </div>
-      <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
-        {% include nav.html %}
-      </nav>
-      <footer class="site-footer">
-        This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
-      </footer>
-    </div>
-    <div id="main-wrap" class="main-wrap" tabindex="0">
-      <div class="main">
-        <div id="main-header" class="main-header">
-          {% if site.search_enabled != false %}
-            <div class="search">
-              <div class="search-input-wrap">
-                <input type="text" id="search-input" class="search-input" tabindex="0" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">
-                <svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#search"></use></svg>
-              </div>
-              <div id="search-results" class="search-results"></div>
-            </div>
-          {% endif %}
-          {% if site.aux_links %}
-            <nav aria-label="Auxiliary" class="aux-nav">
-              <ul class="aux-nav-list">
-                {% for link in site.aux_links %}
-                  <li class="aux-nav-list-item"><a href="{{ link.last }}">{{ link.first }}</a></li>
-                {% endfor %}
-              </ul>
-            </nav>
-          {% endif %}
-        </div>
-        <div id="main-content-wrap" class="main-content-wrap">
-          {% unless page.url == "/" %}
-            {% if page.parent %}
-              <nav aria-label="Breadcrumb" class="breadcrumb-nav">
-                <ol class="breadcrumb-nav-list">
-                  {% if page.grand_parent %}
-                    <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.grand_parent }}</a></li>
-                    <li class="breadcrumb-nav-list-item"><a href="{{ second_level_url }}">{{ page.parent }}</a></li>
-                  {% else %}
-                    <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.parent }}</a></li>
-                  {% endif %}
-                  <li class="breadcrumb-nav-list-item"><span>{{ page.title }}</span></li>
-                </ol>
-              </nav>
-            {% endif %}
-          {% endunless %}
-          <div id="main-content" class="main-content" role="main">
-            {% if site.heading_anchors != false %}
-              {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#link\"></use></svg>" anchorClass="anchor-heading" %}
-            {% else %}
-              {{ content }}
-            {% endif %}
-
-            {% if page.has_children == true and page.has_toc != false %}
-              <hr>
-              <h2 class="text-delta">Table of contents</h2>
-              {% assign children_list = site.pages | sort:"nav_order" %}
-              <ul>
-                {% for child in children_list %}
-                  {% if child.parent == page.title and child.title != page.title %}
-                  <li>
-                    <a href="{{ child.url | absolute_url }}">{{ child.title }}</a>{% if child.summary %} - {{ child.summary }}{% endif %}
-                  </li>
-                  {% endif %}
-                {% endfor %}
-              </ul>
-            {% endif %}
-
-            {% if site.footer_content != nil %}
-              <hr>
-              <footer role="contentinfo">
-                <p class="text-small text-grey-dk-000 mb-0">{{ site.footer_content }}</p>
-              </footer>
-            {% endif %}
-
-          </div>
-        </div>
-      </div>
-    </div>
-
-    {% if site.search_enabled != false %}
-      <a href="#" id="search-button" class="search-button">
-        <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#search"></use></svg>
+  <div class="side-bar">
+    <div class="site-header">
+      <a href="{{ '/' | absolute_url }}" class="site-title lh-tight">{% include title.html %}</a>
+      <a href="#" id="menu-button" class="site-button">
+        <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#menu"></use></svg>
       </a>
-    {% endif %}
+    </div>
+    <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
+      {% include nav.html %}
+    </nav>
+    <footer class="site-footer">
+      This site uses <a href="https://github.com/pmarsceill/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
+    </footer>
   </div>
+  <div class="main">
+    <div id="main-header" class="main-header">
+      {% if site.search_enabled != false %}
+        <div class="search">
+          <div class="search-input-wrap">
+            <input type="text" id="search-input" class="search-input" tabindex="0" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">
+            <svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#search"></use></svg>
+          </div>
+          <div id="search-results" class="search-results"></div>
+        </div>
+      {% endif %}
+      {% if site.aux_links %}
+        <nav aria-label="Auxiliary" class="aux-nav">
+          <ul class="aux-nav-list">
+            {% for link in site.aux_links %}
+              <li class="aux-nav-list-item"><a href="{{ link.last }}">{{ link.first }}</a></li>
+            {% endfor %}
+          </ul>
+        </nav>
+      {% endif %}
+    </div>
+    <div id="main-content-wrap" class="main-content-wrap">
+      {% unless page.url == "/" %}
+        {% if page.parent %}
+          <nav aria-label="Breadcrumb" class="breadcrumb-nav">
+            <ol class="breadcrumb-nav-list">
+              {% if page.grand_parent %}
+                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.grand_parent }}</a></li>
+                <li class="breadcrumb-nav-list-item"><a href="{{ second_level_url }}">{{ page.parent }}</a></li>
+              {% else %}
+                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.parent }}</a></li>
+              {% endif %}
+              <li class="breadcrumb-nav-list-item"><span>{{ page.title }}</span></li>
+            </ol>
+          </nav>
+        {% endif %}
+      {% endunless %}
+      <div id="main-content" class="main-content" role="main">
+        {% if site.heading_anchors != false %}
+          {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#link\"></use></svg>" anchorClass="anchor-heading" %}
+        {% else %}
+          {{ content }}
+        {% endif %}
+
+        {% if page.has_children == true and page.has_toc != false %}
+          <hr>
+          <h2 class="text-delta">Table of contents</h2>
+          {% assign children_list = site.pages | sort:"nav_order" %}
+          <ul>
+            {% for child in children_list %}
+              {% if child.parent == page.title and child.title != page.title %}
+              <li>
+                <a href="{{ child.url | absolute_url }}">{{ child.title }}</a>{% if child.summary %} - {{ child.summary }}{% endif %}
+              </li>
+              {% endif %}
+            {% endfor %}
+          </ul>
+        {% endif %}
+
+        {% if site.footer_content != nil %}
+          <hr>
+          <footer role="contentinfo">
+            <p class="text-small text-grey-dk-000 mb-0">{{ site.footer_content }}</p>
+          </footer>
+        {% endif %}
+
+      </div>
+    </div>
+  </div>
+
+  {% if site.search_enabled != false %}
+    <a href="#" id="search-button" class="search-button">
+      <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#search"></use></svg>
+    </a>
+  {% endif %}
 
 </body>
 </html>
diff --git a/_sass/layout.scss b/_sass/layout.scss
index c184470..eaf0487 100644
--- a/_sass/layout.scss
+++ b/_sass/layout.scss
@@ -2,19 +2,6 @@
 // The basic two column layout
 //
 
-.page-wrap {
-  @include mq(md) {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: flex;
-    width: 100%;
-    height: 100%;
-    overflow-x: hidden;
-    overflow-y: hidden;
-  }
-}
-
 .side-bar {
   z-index: 100;
   display: flex;
@@ -23,7 +10,7 @@
 
   @include mq(md) {
     flex-wrap: nowrap;
-    position: absolute;
+    position: fixed;
     width: $nav-width-md;
     height: 100%;
     flex-direction: column;
@@ -37,23 +24,6 @@
   }
 }
 
-.main-wrap {
-  @include mq(md) {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    -webkit-overflow-scrolling: touch;
-    overflow-x: hidden;
-    overflow-y: scroll;
-  }
-
-  &:focus {
-    outline: none;
-  }
-}
-
 .main {
   @include mq(md) {
     position: relative;
diff --git a/assets/js/just-the-docs.js b/assets/js/just-the-docs.js
index ba197d9..939392f 100644
--- a/assets/js/just-the-docs.js
+++ b/assets/js/just-the-docs.js
@@ -306,16 +306,10 @@ function initSearch() {
 }
 {%- endif %}
 
-function pageFocus() {
-  var mainWrap = document.getElementById('main-wrap');
-  mainWrap.focus();
-}
-
 // Document ready
 
 jtd.onReady(function(){
   initNav();
-  pageFocus();
   {% if site.search_enabled != false -%}
   initSearch();
   {%- endif %}