diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index c02a5474..4f477a21 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -13,12 +13,12 @@
         {% endif %}
     </div>
     <div class="block">
-        <input type="radio" class="toggle-control" name="edit-goal" id="show-edit-goal">
+        <input type="radio" class="toggle-control" name="edit-goal" id="show-edit-goal" data-hover-target="edit-form-header">
         <div class="toggle-content{% if goal %} hidden{% endif %}">
             {% now 'Y' as year %}
-            <article class="card">
+            <section class="card">
                 <header class="card-header">
-                    <h2 class="card-header-title has-background-primary has-text-white">
+                    <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
                         <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {{ year }} reading goal
                     </h2>
                 </header>
@@ -27,7 +27,7 @@
 
                     {% include 'snippets/goal_form.html' with goal=goal year=year %}
                 </section>
-            </article>
+            </section>
         </div>
     </div>
     {% endif %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index b856b879..e22aa15f 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -10,7 +10,7 @@
                 <div class="control">
                     <input type="number" class="input" name="goal" id="id_goal" value="{% if goal %}{{ goal.goal }}{% else %}12{% endif %}">
                 </div>
-                <p class="button is-static">books</p>
+                <p class="button is-static" aria-hidden="true">books</p>
             </div>
         </div>
 
diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index b727790d..997fbfbd 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -6,5 +6,5 @@
     {% endif %}
     {% if goal.user == request.user %}You've{% else %}{{ goal.user.display_name }} has{% endif %} read {% if request.path != goal.local_path %}<a href="{{ goal.local_path }}">{% endif %}{{ goal.book_count }} of {{ goal.goal }} books{% if request.path != goal.local_path %}</a>{% endif %}.
 </p>
-<progress class="progress is-large" value="{{ goal.book_count }}" max="{{ goal.goal }}">{{ goal.progress_percent }}%</progress>
+<progress class="progress is-large" value="{{ goal.book_count }}" max="{{ goal.goal }}" aria-hidden="true">{{ goal.progress_percent }}%</progress>