diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index 2b40a9e3..ac049f25 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -1,7 +1,7 @@
 {% spaceless %}
 {% load i18n %}
 
-<p class="stars">
+<span class="stars">
     <span class="is-sr-only">
         {% if rating %}
             {% blocktranslate trimmed with rating=rating|floatformat count counter=rating|length %}
@@ -23,5 +23,5 @@
             aria-hidden="true"
         ></span>
     {% endfor %}
-</p>
+</span>
 {% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 05662098..44c52c83 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -6,120 +6,122 @@
 {% with status_type=status.status_type %}
 <div
     class="block"
-    {% firstof "reviewBody" as body_prop %}
-    {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-
-    itemprop="rating"
-    itemtype="https://schema.org/Rating"
+    {% if status_type == "Review" %}
+        itemprop="rating"
+        itemtype="https://schema.org/Rating"
+    {% endif %}
 >
 
     <div class="columns">
-    {% if not hide_book %}
-    {% with book=status.book|default:status.mention_books.first %}
-    <div class="column is-narrow">
-        <div>
+        {% if not hide_book %}
+        {% with book=status.book|default:status.mention_books.first %}
+        <div class="column is-narrow is-hidden-mobile">
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
             {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
-    </div>
-    {% endwith %}
-    {% endif %}
+        {% endwith %}
+        {% endif %}
 
-    <article class="column">
-        {% if status_type == 'Review' %}
-        <header class="mb-2">
-            <h3
-                class="title is-5 has-subtitle"
-                dir="auto"
-                itemprop="name"
-            >
-                {{ status.name|escape }}
-            </h3>
-
-            <h4 class="subtitle is-6">
-                <span
-                    class="is-hidden"
-                    {{ rating_type }}
+        <article class="column">
+            {% if status_type == 'Review' %}
+            <header class="mb-2">
+                <h3
+                    class="title is-5 has-subtitle"
+                    dir="auto"
+                    itemprop="name"
                 >
-                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+                    {{ status.name|escape }}
+                </h3>
 
-                    {# @todo Is it possible to not hard-code the value? #}
-                    <meta itemprop="bestRating" content="5">
-                </span>
-                {% include 'snippets/stars.html' with rating=status.rating %}
-            </h4>
-        </header>
-        {% endif %}
+                <h4 class="subtitle is-6">
+                    <span
+                        class="is-hidden"
+                        {% if status_type == "Review" %}
+                            itemprop="reviewRating"
+                            itemscope
+                            itemtype="https://schema.org/Rating"
+                        {% endif %}
+                    >
+                        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
 
-        {% if status.content_warning %}
-            <div>
-                <p>{{ status.content_warning }}</p>
-
-                {% trans "Show more" as button_text %}
-
-                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                    {% include 'snippets/toggle/open_button.html' %}
-                {% endwith %}
-            </div>
-        {% endif %}
-
-        <div
-            {% if status.content_warning %}
-                id="show-status-cw-{{ status.id }}"
-                class="is-hidden"
-            {% endif %}
-        >
-            {% if status.content_warning %}
-                {% trans "Show less" as button_text %}
-
-                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                    {% include 'snippets/toggle/close_button.html' %}
-                {% endwith %}
+                        {# @todo Is it possible to not hard-code the value? #}
+                        <meta itemprop="bestRating" content="5">
+                    </span>
+                    {% include 'snippets/stars.html' with rating=status.rating %}
+                </h4>
+            </header>
             {% endif %}
 
-            {% if status.quote %}
-                <div class="quote block">
-                    <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+            {% if status.content_warning %}
+                <div>
+                    <p>{{ status.content_warning }}</p>
 
-                    <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+                    {% trans "Show more" as button_text %}
+
+                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                        {% include 'snippets/toggle/open_button.html' %}
+                    {% endwith %}
                 </div>
             {% endif %}
 
-            {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
-                {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
-                    {% include 'snippets/trimmed_text.html' %}
-                {% endwith %}
-            {% endif %}
+            <div
+                {% if status.content_warning %}
+                    id="show-status-cw-{{ status.id }}"
+                    class="is-hidden"
+                {% endif %}
+            >
+                {% if status.content_warning %}
+                    {% trans "Show less" as button_text %}
 
-            {% if status.attachments.exists %}
-                <div class="block">
-                    <div class="columns">
-                        {% for attachment in status.attachments.all %}
-                            <div class="column is-narrow">
-                                <figure class="image is-128x128">
-                                    <a
-                                        href="/images/{{ attachment.image }}"
-                                        target="_blank"
-                                        aria-label="{% trans 'Open image in new window' %}"
-                                    >
-                                        <img
-                                            src="/images/{{ attachment.image }}"
+                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                        {% include 'snippets/toggle/close_button.html' %}
+                    {% endwith %}
+                {% endif %}
 
-                                            {% if attachment.caption %}
-                                                alt="{{ attachment.caption }}"
-                                                title="{{ attachment.caption }}"
-                                            {% endif %}
-                                        >
-                                    </a>
-                                </figure>
-                            </div>
-                        {% endfor %}
+                {% if status.quote %}
+                    <div class="quote block">
+                        <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+
+                        <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
                     </div>
-                </div>
-            {% endif %}
-        </div>
-    </article>
+                {% endif %}
+
+                {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
+                    {% with full=status.content|safe no_trim=status.content_warning itemprop="reviewBody" %}
+                        {% include 'snippets/trimmed_text.html' %}
+                    {% endwith %}
+                {% endif %}
+
+                {% if status.attachments.exists %}
+                    <div class="block">
+                        <div class="columns">
+                            {% for attachment in status.attachments.all %}
+                                <div class="column is-narrow">
+                                    <figure class="image is-128x128">
+                                        <a
+                                            href="/images/{{ attachment.image }}"
+                                            target="_blank"
+                                            aria-label="{% trans 'Open image in new window' %}"
+                                        >
+                                            <img
+                                                src="/images/{{ attachment.image }}"
+
+                                                {% if attachment.caption %}
+                                                    alt="{{ attachment.caption }}"
+                                                    title="{{ attachment.caption }}"
+                                                {% endif %}
+                                            >
+                                        </a>
+                                    </figure>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                {% endif %}
+            </div>
+        </article>
+    </div>
 </div>
 
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index f4186cd1..f3bbae44 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -3,29 +3,9 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 
-{% if status_type == 'Rating' %}
-<div
-    class="block"
-        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-        itemprop="rating"
-        itemtype="https://schema.org/Rating"
->
-    <div>
-        <span class="is-sr-only" {{ rating_type }}>
-            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                {# @todo Is it possible to not hard-code the value? #}
-                <meta itemprop="bestRating" content="5">
-        </span>
-
-        {% include 'snippets/stars.html' with rating=status.rating %}
-    </div>
-</div>
-{% endif %}
-
 {% if not hide_book %}
 {% with book=status.book|default:status.mention_books.first %}
-<div class="columns">
+<div class="columns is-mobile">
     <div class="column is-narrow">
         <div>
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 6493bd54..0fa74ddd 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -40,10 +40,29 @@
 
     {% endwith %}
 {% endif %}
+
 {% if status.book %}
-<a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>
+    {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+        <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+        <span
+            itemprop="reviewRating"
+            itemscope
+            itemtype="https://schema.org/Rating"
+        >
+        <span class="is-hidden" {{ rating_type }}>
+            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {# @todo Is it possible to not hard-code the value? #}
+                <meta itemprop="bestRating" content="5">
+        </span>
+
+        {% include 'snippets/stars.html' with rating=status.rating %}
+        {% endif %}
+    {% else %}
+        {% include 'snippets/book_titleby.html' with book=status.book %}
+    {% endif %}
 {% elif status.mention_books %}
-<a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
+    <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
 {% endif %}
 
 {% if status.progress %}