diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button.html
index 783a039c5..9ebb39ce5 100644
--- a/bookwyrm/templates/snippets/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button.html
@@ -1,21 +1,22 @@
 {% load fr_display %}
 {% if request.user.is_authenticated %}
 
+<div class="field is-grouped">
+<form name="shelve" action="/shelve/" method="post">
+    {% csrf_token %}
+    <input type="hidden" name="book" value="{{ book.id }}">
+    <input type="hidden" name="shelf" value="{% shelve_button_identifier book %}">
+    <button class="button" type="submit" style="">{% shelve_button_text book %}</button>
+</form>
 <div class="dropdown is-hoverable">
-    <form name="shelve" action="/shelve/" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="book" value="{{ book.id }}">
-        <input type="hidden" name="shelf" value="{% shelve_button_identifier book %}">
-        <button class="button" type="submit" style="">{% shelve_button_text book %}</button>
-    </form>
+    {% if not hide_pulldown %}
     <div class="button dropdown-trigger" >
         <span class="icon icon-arrow-down"><span class="hidden-text">More shelves</span></span>
     </div>
 
-    {% if not hide_pulldown %}
     <div class="dropdown-menu">
         <ul class="dropdown-content">
-            <form name="shelve" action="/shelve/" method="post">
+            <form class="dropdown-item" name="shelve" action="/shelve/" method="post">
                 {% csrf_token %}
                 <input type="hidden" name="book" value="{{ book.id }}">
                 {% for shelf in request.user.shelf_set.all %}
@@ -29,4 +30,5 @@
     {% endif %}
 </div>
 
+</div>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status_content.html
index 2d9dfa5ab..be7d8935a 100644
--- a/bookwyrm/templates/snippets/status_content.html
+++ b/bookwyrm/templates/snippets/status_content.html
@@ -1,9 +1,10 @@
 {% load fr_display %}
 
-{% if not hide_book and status.mention_books.count %}
-    <div class="row">
+<div class="media">
+    {% if not hide_book and status.mention_books.count %}
+    <div class="media-left">
     {% for book in status.mention_books.all|slice:"0:4" %}
-        <div class="row">
+        <div>
             <div class="cover-container">
                 {% include 'snippets/book_cover.html' with book=book %}
                 {% if status.mention_books.count > 1 %}
@@ -21,9 +22,8 @@
         </div>
     {% endfor %}
     </div>
-{% endif %}
+    {% endif %}
 
-<div class="media">
     {% if not hide_book and status.book %}
     <div class="media-left">
         {% include 'snippets/book_cover.html' with book=status.book %}