diff --git a/pydata_sphinx_theme/layout.html b/pydata_sphinx_theme/layout.html
index f3719e77b..55acb2b2f 100644
--- a/pydata_sphinx_theme/layout.html
+++ b/pydata_sphinx_theme/layout.html
@@ -33,7 +33,7 @@
 {% block sidebarsourcelink %}{% endblock %}
 
 {% block body_tag %}
-  <body data-spy="scroll" data-target="#bd-toc-nav" data-offset="80">
+  <body>
 {%- endblock %}
 {%- block content %}
     {% block docs_navbar %}
@@ -42,55 +42,59 @@
     </nav>
     {% endblock %}
 
-    <div class="container-xl">
-      <div class="row">
-          {% block docs_sidebar %}
-          <div class="col-12 col-md-3 bd-sidebar">
-              {%- include "docs-sidebar.html" %}
-          </div>
-          {% endblock %}
-
-          {% block docs_toc %}
-          <div class="d-none d-xl-block col-xl-2 bd-toc">
-              {% if not (meta is not none and 'notoc' in meta) %}
-                {%- include "docs-toc.html" %}
-              {% endif %}
-          </div>
-          {% endblock %}
-
-          {% block docs_main %}
-          <main class="col-12 col-md-9 col-xl-7 py-md-5 pl-md-5 pr-md-4 bd-content" role="main">
-              {% block docs_body %}
-              <div>
-                {% block body %} {% endblock %}
-              </div>
-              {% endblock %}
-              {% if theme_show_prev_next %}
-              <div class='prev-next-bottom'>
-                {{ prev_next(prev, next) }}
-              </div>
-              {% endif %}
-          </main>
-          {% endblock %}
 
+    <div class="content-container container-fluid" data-spy="scroll" data-target="#bd-toc-nav" data-offset="20">
+      <div class="container-xl">
+        <div class="row">
+            {% block docs_sidebar %}
+            <div class="col-12 col-md-3 bd-sidebar">
+                {%- include "docs-sidebar.html" %}
+            </div>
+            {% endblock %}
+
+            {% block docs_toc %}
+            <div class="d-none d-xl-block col-xl-2 bd-toc">
+                {% if not (meta is not none and 'notoc' in meta) %}
+                  {%- include "docs-toc.html" %}
+                {% endif %}
+            </div>
+            {% endblock %}
+
+            {% block docs_main %}
+            <main class="col-12 col-md-9 col-xl-7 py-md-5 pl-md-5 pr-md-4 bd-content" role="main">
+                {% block docs_body %}
+                <div>
+                  {% block body %} {% endblock %}
+                </div>
+                {% endblock %}
+                {% if theme_show_prev_next %}
+                <div class='prev-next-bottom'>
+                  {{ prev_next(prev, next) }}
+                </div>
+                {% endif %}
+            </main>
+            {% endblock %}
+
+        </div>
       </div>
-    </div>
 
-    <script src="{{ pathto('_static/js/index.js', 1) }}"></script>
-    {% if theme_google_analytics_id %}
-    <!-- Google Analytics -->
-    <script>
-      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-      ga('create', '{{ theme_google_analytics_id }}', 'auto');
-      ga('set', 'anonymizeIp', true);
-      ga('send', 'pageview');
-    </script>
-    <script async src='https://www.google-analytics.com/analytics.js'></script>
-    <!-- End Google Analytics -->
-    {% endif %}
 
-{%- endblock %}
+      {%- block footer %}
+      {%- include "footer.html" %}
+      {%- endblock %}
+
+      <script src="{{ pathto('_static/js/index.js', 1) }}"></script>
+      {% if theme_google_analytics_id %}
+      <!-- Google Analytics -->
+      <script>
+        window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+        ga('create', '{{ theme_google_analytics_id }}', 'auto');
+        ga('set', 'anonymizeIp', true);
+        ga('send', 'pageview');
+      </script>
+      <script async src='https://www.google-analytics.com/analytics.js'></script>
+      <!-- End Google Analytics -->
+      {% endif %}
+    </div>
 
-{%- block footer %}
-{%- include "footer.html" %}
 {%- endblock %}
\ No newline at end of file
diff --git a/src/scss/_base.scss b/src/scss/_base.scss
index 8c7a3b06d..2fa055887 100644
--- a/src/scss/_base.scss
+++ b/src/scss/_base.scss
@@ -8,7 +8,7 @@ body {
   font-weight: 400;
   line-height: 1.65;
   color: #333;
-  padding-top: 75px;
+  height: 100vh;
 }
 
 p {
@@ -48,14 +48,6 @@ a {
   font-family: 'Open Sans', sans-serif;
   font-weight: 400;
   line-height: 1.15;
-
-  &::before {
-    // offsetting html anchor titles to adjust for fixed header
-    display: block;
-    content: '';
-    height: 80px;
-    margin: -80px 0 0;
-  }
 }
 
 h1 {
diff --git a/src/scss/index.scss b/src/scss/index.scss
index dbad77f57..16679d3c4 100644
--- a/src/scss/index.scss
+++ b/src/scss/index.scss
@@ -16,7 +16,7 @@ $container-max-widths: (
 @import './base';
 @import './navbar';
 
-// Custom css, TODO: to be refactored in different partials
+
 .deprecated {
   margin-bottom: 10px;
   margin-top: 10px;
@@ -137,7 +137,7 @@ td:first-child {
   @supports (position: -webkit-sticky) or (position: sticky) {
     position: -webkit-sticky;
     position: sticky;
-    top: 5rem;
+    top: 0;
     height: calc(100vh - 5rem);
     overflow-y: auto;
   }
@@ -184,7 +184,7 @@ td:first-child {
     @supports (position: -webkit-sticky) or (position: sticky) {
       position: -webkit-sticky;
       position: sticky;
-      top: 76px;
+      top: 0px;
       z-index: 1000;
       height: calc(100vh - 4rem);
     }
