diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index a630918a..3a565221 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -92,7 +92,7 @@
                 </span>
                 {% with count=books.paginator.count %}
                 {% if count %}
-                <p class="help">
+                <span class="help">
                     {% blocktrans trimmed count counter=count with formatted_count=count|intcomma %}
                         {{ formatted_count }} book
                     {% plural %}
@@ -104,7 +104,7 @@
                         (showing {{ start }}-{{ end }})
                         {% endblocktrans %}
                     {% endif %}
-                </p>
+                </span>
                 {% endif %}
                 {% endwith %}
             </h2>
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index ea609666..197cf5b6 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -17,7 +17,7 @@
 
 {% if shelf.editable %}
 <li role="menuitem" class="dropdown-item p-0">
-    <form name="shelve" action="/shelve/" method="post">
+    <form name="editable-shelve-{{ uuid }}" action="/shelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
@@ -67,7 +67,7 @@
 {% if user_shelf in book.shelves.all %}
 <li class="navbar-divider m-0" role="separator" ></li>
 <li role="menuitem" class="dropdown-item p-0">
-    <form name="shelve" action="/unshelve/" method="post">
+    <form name="shelve-{{ user_shelf.identifier }}-{{ book.id }}-{{ uuid }}" action="/unshelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ user_shelf.id }}">
@@ -79,7 +79,7 @@
 {% else %}
 <li class="navbar-divider" role="separator" ></li>
 <li role="menuitem" class="dropdown-item p-0">
-    <form name="shelve" action="/unshelve/" method="post">
+    <form name="un-shelve-{{ shelf.identifier }}-{{ book.id }}-{{ uuid }}" action="/unshelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ shelf.id }}">
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
index 5a29f9ad..1fa26a88 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
@@ -58,7 +58,7 @@
 
 {% if active_shelf.shelf %}
 <li role="menuitem" class="dropdown-item p-0" data-extra-options>
-    <form  name="shelve" action="/unshelve/" method="post">
+    <form name="unshelve-{{ uuid }}-{{ shelf.identifier }}" action="/unshelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
         <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">