diff --git a/bookwyrm/templates/feed.html b/bookwyrm/templates/feed.html
index aec76acc..f02219bc 100644
--- a/bookwyrm/templates/feed.html
+++ b/bookwyrm/templates/feed.html
@@ -44,18 +44,28 @@
         <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" role="tabpanel" id="book-{{ book.id }}-panel">
-                <div class="box">
-                    <div class="block">
-                        {% include 'snippets/book_titleby.html' with book=book %}
-                        {% include 'snippets/shelve_button.html' with book=book %}
+                <div class="card">
+                    <div class="card-header">
+                        <p class="card-header-title">
+                        <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
+                        </>
+                        <div class="card-header-icon is-hidden-tablet">
+                            <label class="delete" for="no-book" aria-label="close" role="button"></label>
+                        </div>
+                    </div>
+                    <div class="card-content">
+                            {% include 'snippets/shelve_button.html' with book=book %}
+                        {% include 'snippets/create_status.html' with book=book %}
                     </div>
-                    {% include 'snippets/create_status.html' with book=book %}
                 </div>
             </div>
         </div>
         {% endfor %}
         {% endwith %}
         {% endfor %}
+        <div>
+            <input class="toggle-control" type="radio" name="recent-books" id="no-book">
+        </div>
         {% endif %}
     </div>
 
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 6d15b37f..0df2d6d1 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 <div class="cover-container is-{{ size }}">
 {% if book.cover %}
-<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}">
+<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}" title="{{ book.alt_text }}">
 {% else %}
     <div class="no-cover book-cover">
         <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index d8b84646..b01ede4c 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,9 +1,5 @@
-<span>
-    <a href="/book/{{ book.id }}">{{ book.title }}</a>
-</span>
+<a href="/book/{{ book.id }}">{{ book.title }}</a>
 {% if book.authors %}
-<span>
-    by {% include 'snippets/authors.html' with book=book %}
-</span>
+by {% include 'snippets/authors.html' with book=book %}
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status_content.html
index 95d6f8ee..d2663653 100644
--- a/bookwyrm/templates/snippets/status_content.html
+++ b/bookwyrm/templates/snippets/status_content.html
@@ -43,7 +43,7 @@
                 <div class="column is-narrow">
                     <figure class="image is-128x128">
                         <a href="/images/{{ attachment.image }}" target="_blank" aria-label="open image in new window">
-                            <img src="/images/{{ attachment.image }}" alt="{{ attachment.caption }}">
+                            <img src="/images/{{ attachment.image }}"{% if attachment.caption %} alt="{{ attachment.caption }}" title="{{ attachment.caption }}"{% endif %}>
                         </a>
                     </figure>
                 </div>