diff --git a/bookwyrm/templates/feed.html b/bookwyrm/templates/feed.html
index 46e7bc2a8..ed1fea0f0 100644
--- a/bookwyrm/templates/feed.html
+++ b/bookwyrm/templates/feed.html
@@ -17,12 +17,12 @@
                     <p>
                         {{ shelf.name }}
                     </p>
-                    <div class="tabs is-small is-toggle">
+                    <div class="tabs is-small is-toggle" role="tablist">
                         <ul>
                             {% for book in shelf.books %}
                             <li class="{% if shelf_counter == 1 and forloop.first %}is-active{% endif %}" data-id="tab-book-{{ book.id }}">
                                 <label for="book-{{ book.id }}" onclick="tabChange(event, nested=true)">
-                                    <div role="tab" tabindex="0" aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}">
+                                    <div role="tab" tabindex="0" aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}-panel">
                                         <a>
                                             {% include 'snippets/book_cover.html' with book=book size="medium" %}
                                         </a>
@@ -43,7 +43,7 @@
         {% for book in shelf.books %}
         <div>
             <input class="toggle-control" type="radio" name="recent-books" id="book-{{ book.id }}" {% if shelf_counter == 1 and forloop.first %}checked{% endif %}>
-            <div class="toggle-content hidden">
+            <div class="toggle-content hidden" role="tabpanel" id="book-{{ book.id }}-panel">
                 <div class="block">
                     {% include 'snippets/book_titleby.html' with book=book %}
                     {% include 'snippets/shelve_button.html' with book=book %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index d2c205ca3..930ca943c 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -30,14 +30,18 @@
                 <input aria-label="Search for a book or user" id="search-input" class="input" type="text" name="q" placeholder="Search for a book or user" value="{{ query }}">
                 <button class="button" type="submit">
                     <span class="icon icon-search">
-                    <span class="is-sr-only">search</span>
+                        <span class="is-sr-only">search</span>
                     </span>
                 </button>
             </div>
         </form>
 
-        <label for="main-nav" role="button" class="navbar-item" aria-label="menu" aria-expanded="false" data-target="mainNav" onclick="toggleMenu(this)">
-            <div class="icon icon-dots-three-vertical"><span class="is-sr-only">Main navigation menu</div>
+        <label for="main-nav" role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="mainNav" onclick="toggleMenu(this)" tabindex="0">
+            <div class="navbar-item mt-3">
+                <div class="icon icon-dots-three-vertical">
+                    <span class="is-sr-only">Main navigation menu</span>
+                </div>
+            </div>
         </label>
     </div>
 
diff --git a/bookwyrm/templates/snippets/book_description.html b/bookwyrm/templates/snippets/book_description.html
index 82f8db37c..1352f6f59 100644
--- a/bookwyrm/templates/snippets/book_description.html
+++ b/bookwyrm/templates/snippets/book_description.html
@@ -7,12 +7,14 @@
     <div>
         <input type="radio" name="show-hide-{{ book.id }}-{{ uuid }}" id="show-{{ book.id }}-{{ uuid }}" class="toggle-control" checked>
         <blockquote class="content toggle-content hidden">{{ trimmed }}
-            <label class="button is-small" for="hide-{{ book.id }}-{{ uuid }}">show more</label></blockquote>
+            <label class="button is-small" for="hide-{{ book.id }}-{{ uuid }}"><div role="button" tabindex="0">show more</div></label>
+        </blockquote>
     </div>
     <div>
         <input type="radio" name="show-hide-{{ book.id }}-{{ uuid }}" id="hide-{{ book.id }}-{{ uuid }}" class="toggle-control">
         <blockquote class="content toggle-content hidden">{{ full }}
-        <label class="button is-small" for="show-{{ book.id }}-{{ uuid }}">show less</label></blockquote>
+            <label class="button is-small" for="show-{{ book.id }}-{{ uuid }}"><div role="button" tabindex="0">show less</div></label>
+        </blockquote>
     </div>
     {% else %}
     <blockquote class="content">{{ full }}