diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 3b8270773..1e9db4011 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -247,7 +247,7 @@ class AnnualGoal(BookWyrmModel):
         ''' the books you've read this year '''
         return self.user.readthrough_set.filter(
             finish_date__year__gte=self.year
-        ).order_by('finish_date').all()
+        ).order_by('-finish_date').all()
 
 
     @property
diff --git a/bookwyrm/templates/snippets/components/card.html b/bookwyrm/templates/snippets/components/card.html
index 3c2cf9f1e..f1104893a 100644
--- a/bookwyrm/templates/snippets/components/card.html
+++ b/bookwyrm/templates/snippets/components/card.html
@@ -4,10 +4,12 @@
         {% endblock %}
     </header>
 
+    {% if not status or status.status_type != 'GeneratedNote' or status.book or status.mention_books.exists or status.mention_users.exists %}
     <section class="card-content">
         {% block card-content %}
         {% endblock %}
     </section>
+    {% endif %}
 
     <footer class="card-footer has-background-white-bis">
         {% block card-footer %}
diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button.html
index 0dfabe04f..f69ab5257 100644
--- a/bookwyrm/templates/snippets/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button.html
@@ -4,11 +4,12 @@
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
 <div class="field has-addons">
+    {% if switch_mode and active_shelf.book != book %}
     <div class="control">
-        {% if switch_mode and active_shelf.book != book %}
         {% include 'snippets/switch_edition_button.html' with edition=book size='is-small' %}
-        {% else %}
-
+    </div>
+    {% else %}
+    <div class="control">
         {% if active_shelf.shelf.identifier == 'read' %}
         <button class="button is-small" disabled>
             <span>Read</span> <span class="icon icon-check"></span>
diff --git a/bookwyrm/templates/snippets/switch_edition_button.html b/bookwyrm/templates/snippets/switch_edition_button.html
index 685aed7c3..86c438b13 100644
--- a/bookwyrm/templates/snippets/switch_edition_button.html
+++ b/bookwyrm/templates/snippets/switch_edition_button.html
@@ -1,5 +1,5 @@
 <form name="switch-edition" action="/switch-edition" method="POST">
     {% csrf_token %}
     <input type="hidden" name="edition" value="{{ edition.id }}">
-    <button class="button {{ size }}">Switch to this edition</button>
+    <button type="submit" class="button {{ size }}">Switch to this edition</button>
 </form>