diff --git a/_config.yml b/_config.yml
index f202cdbb81b43a9b142c8761677f55da7fba0127..2af82026334b1d374b4fb50d499428389d6a0b7a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -24,6 +24,9 @@ exclude: ["node_modules/", "*.gemspec", "*.gem", "Gemfile", "Gemfile.lock", "pac
 # Enable or disable the site search
 search_enabled: true
 
+# Enable or disable heading anchors
+heading_anchors: true
+
 # Aux links for the upper right navigation
 aux_links:
   "Just the Docs on GitHub":
diff --git a/_layouts/default.html b/_layouts/default.html
index 833f7c00cebdcea2487e59a343f98d20c8df957d..209597c8eb2d00951ca575b7f0dc164d5c8d0597 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -12,7 +12,7 @@ layout: table_wrappers
     <div class="side-bar">
       <div class="site-header">
         <a href="{{ site.url }}{{ site.baseurl }}" class="site-title">{% include title.html %}</a>
-        <a href="#" class="site-button fs-3 js-main-nav-trigger" data-text-toggle="Hide">Menu</a>
+        <button class="menu-button fs-3 js-main-nav-trigger" data-text-toggle="Hide" type="button">Menu</button>
       </div>
       <div class="navigation main-nav js-main-nav">
         {% include nav.html %}
@@ -58,7 +58,7 @@ layout: table_wrappers
             {% endif %}
           {% endunless %}
           <div id="main-content" class="page-content" role="main">
-            {% if site.anchor_headings != false  %}
+            {% if site.heading_anchors != nil  %}
               {% include vendor/anchor_headings.html html=content  beforeHeading = "true" anchorBody="<svg class=\"d-inline-block v-align-middle\" viewBox=\"0 0 16 16\" version=\"1.1\" width=\"18\" height=\"18\" aria-hidden=\"true\"><path fill-rule=\"evenodd\" d=\"M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z\"></path></svg>" anchorClass="anchor-heading" %}
             {% else %}
               {{ content }}
diff --git a/_sass/content.scss b/_sass/content.scss
index 0ea0629120dfa30d4ad3baa7e25a829b1bc4f4d8..275599e808660f86f7b21a69f5aeb9fd4c1299e1 100644
--- a/_sass/content.scss
+++ b/_sass/content.scss
@@ -113,14 +113,16 @@
   }
 
   .anchor-heading {
+    position: absolute;
+    right: -$sp-3;
+    width: $sp-5;
+    height: 100%;
     fill: $link-color;
     visibility: hidden;
 
     @include mq(md) {
-      position: absolute;
+      right: auto;
       left: -$sp-5;
-      width: $sp-5;
-      height: 100%;
     }
   }
 
diff --git a/_sass/layout.scss b/_sass/layout.scss
index e92584c745295d01444fc2ea9d694fc70ab84566..ddd518075656f62b290bacd559546898700ae07c 100644
--- a/_sass/layout.scss
+++ b/_sass/layout.scss
@@ -85,10 +85,10 @@
   background-color: $sidebar-color;
 
   @include mq(md) {
-    background-color: $body-background-color;
     display: flex;
     justify-content: flex-end;
     height: $header-height;
+    background-color: $body-background-color;
     border-bottom: $border $border-color;
   }
 
@@ -128,10 +128,10 @@
   align-items: center;
 
   @include mq(md) {
+    z-index: 101;
     height: $header-height;
     min-height: $header-height;
     max-height: $header-height;
-    z-index: 101;
     border-bottom: $border $border-color;
   }
 }
@@ -148,11 +148,16 @@
   @include fs-6;
 }
 
-.site-button {
+.menu-button {
+  appearance: none;
+  display: flex;
   height: 100%;
   padding: $gutter-spacing-sm;
-  display: flex;
   align-items: center;
+  color: $link-color;
+  text-transform: uppercase;
+  background: transparent;
+  border: 0;
 
   @include mq(md) {
     display: none;