diff --git a/layouts/partials/nav-bar.html b/layouts/partials/nav-bar.html
index 13996b1..bf288a2 100644
--- a/layouts/partials/nav-bar.html
+++ b/layouts/partials/nav-bar.html
@@ -7,17 +7,18 @@
     {{ end }}
   </a></h1>
   <div class="hamburger-menu">
-		<input type="checkbox" onclick="hamburgerMenuPressed()"/>
-		<span></span>
-		<span></span>
-    <ul class="hamburger-menu-overlay">
+    <button onclick="hamburgerMenuPressed.call(this)" aria-haspopup="true" aria-expanded="false" aria-controls="menu" aria-label="Menu">
+      <span></span>
+      <span></span>
+    </button>
+    <ul id="menu" class="hamburger-menu-overlay">
       <li><a href="/" class="hamburger-menu-overlay-link">Home</a></li>
       {{ range where .Site.Pages "Params.displayinmenu" true }}
-			<li><a href="{{ .Permalink }}" class="hamburger-menu-overlay-link">{{ .Title }}</a></li>
-			{{ end }}
+      <li><a href="{{ .Permalink }}" class="hamburger-menu-overlay-link">{{ .Title }}</a></li>
+      {{ end }}
       {{ range $key, $value := .Site.Taxonomies.categories }}
-			<li><a href="/categories/{{ $key | urlize  }}" class="hamburger-menu-overlay-link">{{ $key | humanize }}</a></li>
-			{{ end }}
+      <li><a href="/categories/{{ $key | urlize  }}" class="hamburger-menu-overlay-link">{{ $key | humanize }}</a></li>
+      {{ end }}
     </ul>
   </div>
 </nav>
\ No newline at end of file
diff --git a/static/css/style.css b/static/css/style.css
index f938dfc..a03cd76 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -43,37 +43,37 @@ strong {
     -webkit-user-select: none;
     user-select: none;
 }
-.hamburger-menu input {
-  display: block;
-  width: 33px;
-  height: 33px;
-  position: absolute;
-  top: -9px;
-  cursor: pointer;
-  opacity: 0; /* hide this */
-  z-index: 500; /* and place it over the hamburger */
-  -webkit-touch-callout: none;
+.hamburger-menu button {
+    display: block;
+    position: relative;
+    width: 33px;
+    height: 33px;
+    padding: 0px;
+    border: 0px;
+    outline: none;
+    background-color: transparent;
+    z-index: 500; /* and place it over the hamburger */
+    -webkit-touch-callout: none;
 }
-.hamburger-menu span {
-  display: block;
-  width: 33px;
-  height: 4px;
-  position: relative;
-  background-color: #3A3B3C;
-  border-radius: 3px;
-  z-index: 105;
-  transform-origin: center;
-  transition: transform 0.3s cubic-bezier(0.77,0.2,0.05,1.0),
-              background-color 0.3s cubic-bezier(0.77,0.2,0.05,1.0);
+.hamburger-menu button span {
+    display: block;
+    width: 33px;
+    height: 4px;
+    position: relative;
+    background-color: #3A3B3C;
+    border-radius: 3px;
+    transform-origin: center;
+    transition: transform 0.3s cubic-bezier(0.77,0.2,0.05,1.0),
+                background-color 0.3s cubic-bezier(0.77,0.2,0.05,1.0);
 }
-.hamburger-menu span:first-of-type {
+.hamburger-menu button span:first-of-type {
     margin-bottom: 5px;
 }
-.hamburger-menu input:checked ~ span {
+.hamburger-menu-open button span {
     background-color: white;
     transform: rotate(45deg) translate(3.2px , 3.2px);
 }
-.hamburger-menu input:checked ~ span:nth-last-child(2) {
+.hamburger-menu-open button span:last-of-type {
     transform: rotate(-45deg) translate(3.2px , -3.2px);
 }
 .hamburger-menu-overlay {
@@ -94,7 +94,7 @@ strong {
     opacity: 0;
     transition: visibility 0.2s ease-out, opacity 0.2s ease-out;
 }
-input:checked ~ .hamburger-menu-overlay {
+.hamburger-menu-open .hamburger-menu-overlay {
     visibility: visible;
     opacity: 0.9;
 }
diff --git a/static/js/core.js b/static/js/core.js
index 56f8e9f..9b1f92f 100644
--- a/static/js/core.js
+++ b/static/js/core.js
@@ -9,12 +9,16 @@ function cardReleased() {
 }
 
 function hamburgerMenuPressed() {
-    if (document.body.classList.contains('no-scroll')) {
+    if (this.parentNode.classList.contains('hamburger-menu-open')) {
         document.body.classList.remove('no-scroll');
+        this.parentNode.classList.remove('hamburger-menu-open')
+        this.setAttribute('aria-expanded', "false");
         document.body.style.paddingRight = 0 + "px";
     } else {
         document.body.style.paddingRight = window.innerWidth - document.documentElement.clientWidth + "px";
         document.body.classList.add('no-scroll');
+        this.parentNode.classList.add('hamburger-menu-open')
+        this.setAttribute('aria-expanded', "true");
     }
     
 }
\ No newline at end of file