diff --git a/bookwyrm/templates/snippets/components/card.html b/bookwyrm/templates/snippets/components/card.html
new file mode 100644
index 00000000..3c2cf9f1
--- /dev/null
+++ b/bookwyrm/templates/snippets/components/card.html
@@ -0,0 +1,19 @@
+<article class="card">
+    <header class="card-header">
+        {% block card-header %}
+        {% endblock %}
+    </header>
+
+    <section class="card-content">
+        {% block card-content %}
+        {% endblock %}
+    </section>
+
+    <footer class="card-footer has-background-white-bis">
+        {% block card-footer %}
+        {% endblock %}
+    </footer>
+
+    {% block card-bonus %}
+    {% endblock %}
+</article>
diff --git a/bookwyrm/templates/snippets/status_body.html b/bookwyrm/templates/snippets/status_body.html
index d37fa098..f4e46024 100644
--- a/bookwyrm/templates/snippets/status_body.html
+++ b/bookwyrm/templates/snippets/status_body.html
@@ -1,101 +1,88 @@
+{% extends 'snippets/components/card.html' %}
+
 {% load bookwyrm_tags %}
 {% load humanize %}
 
-{% if not status.deleted %}
-<article class="card">
-    <header class="card-header">
-        <div class="card-header-title has-background-white-ter">
-            <div class="columns">
-                <div class="column is-narrow">
-                    {% include 'snippets/status_header.html' with status=status %}
-                </div>
-            </div>
-        </div>
-    </header>
+{% block card-header %}
+    <h3 class="card-header-title has-background-white-ter is-block">
+        {% include 'snippets/status_header.html' with status=status %}
+    </h3>
+{% endblock %}
 
-    <section class="card-content">
-        {% include 'snippets/status_content.html' with status=status %}
-    </section>
 
-    <footer>
-        <div class="card-footer has-background-white-bis">
-            <div class="card-footer-item">
-                {% if request.user.is_authenticated %}
-                {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text="Reply" icon='comment' small=True %}
-                {% include 'snippets/boost_button.html' with status=status %}
-                {% include 'snippets/fav_button.html' with status=status %}
+{% block card-content %}
+    {% include 'snippets/status_content.html' with status=status %}
+{% endblock %}
 
-                {% else %}
-                <a href="/login">
-                    <span class="icon icon-comment" title="Reply">
-                        <span class="is-sr-only">Reply</span>
-                    </span>
 
-                    <span class="icon icon-boost" title="Boost status">
-                        <span class="is-sr-only">Boost status</span>
-                    </span>
+{% block card-footer %}
+<div class="card-footer-item">
+    {% if request.user.is_authenticated %}
+    {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text="Reply" icon='comment' small=True %}
+    {% include 'snippets/boost_button.html' with status=status %}
+    {% include 'snippets/fav_button.html' with status=status %}
 
-                    <span class="icon icon-heart" title="Like status">
-                        <span class="is-sr-only">Like status</span>
-                    </span>
-                </a>
-                {% endif %}
-            </div>
+    {% else %}
+    <a href="/login">
+        <span class="icon icon-comment" title="Reply">
+            <span class="is-sr-only">Reply</span>
+        </span>
 
-            <div class="card-footer-item">
-                {% include 'snippets/privacy-icons.html' with item=status %}
-            </div>
+        <span class="icon icon-boost" title="Boost status">
+            <span class="is-sr-only">Boost status</span>
+        </span>
 
-            <div class="card-footer-item">
-                <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
-            </div>
-            {% if status.user == request.user %}
-            <div class="card-footer-item">
-                {% include 'snippets/toggle/toggle_button.html' with controls_text="more-info" controls_uid=status.id text="More options" icon="dots-three" small=True %}
-            </div>
-            {% endif %}
-        </div>
+        <span class="icon icon-heart" title="Like status">
+            <span class="is-sr-only">Like status</span>
+        </span>
+    </a>
+    {% endif %}
+</div>
 
-        {% if request.user.is_authenticated %}
-        {% with status.id|uuid as uuid %}
-        <input class="toggle-control" type="checkbox" name="show-comment-{{ status.id }}" id="show-comment-{{ status.id }}" data-hover-target="id_content_{{ status.id }}-{{ uuid }}">
-        <div class="toggle-content hidden">
-            <div class="card-footer">
-                <div class="card-footer-item">
-                    {% include 'snippets/reply_form.html' with status=status %}
-                </div>
-            </div>
-        </div>
-        {% endwith %}
-        {% endif %}
+<div class="card-footer-item">
+    {% include 'snippets/privacy-icons.html' with item=status %}
+</div>
 
-        {% if status.user == request.user %}
-        <div>
-            <input class="toggle-control" type="checkbox" name="more-info-{{ status.id }}" id="more-info-{{ status.id }}">
-            <div class="toggle-content hidden card-footer">
-                {% if status.user == request.user %}
-                <div class="card-footer-item">
-                    <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
-                        {% csrf_token %}
-                        <button class="button is-danger is-light" type="submit">
-                            Delete post
-                        </button>
-                    </form>
-                </div>
-                {% endif %}
-            </div>
-        </div>
-        {% endif %}
-    </footer>
-</article>
-{% else %}
-<article class="card">
-    <header class="card-header">
-        <p>
-        {% include 'snippets/avatar.html' with user=status.user %}
-        {% include 'snippets/username.html' with user=status.user %}
-        deleted this status
-        </p>
-    </header>
-</article>
+<div class="card-footer-item">
+    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+</div>
+{% if status.user == request.user %}
+<div class="card-footer-item">
+    {% include 'snippets/toggle/toggle_button.html' with controls_text="more-info" controls_uid=status.id text="More options" icon="dots-three" small=True %}
+</div>
 {% endif %}
+{% endblock %}
+
+
+{% block card-bonus %}
+{% if request.user.is_authenticated %}
+{% with status.id|uuid as uuid %}
+<input class="toggle-control" type="checkbox" name="show-comment-{{ status.id }}" id="show-comment-{{ status.id }}" data-hover-target="id_content_{{ status.id }}-{{ uuid }}">
+<section class="toggle-content hidden">
+    <div class="card-footer">
+        <div class="card-footer-item">
+            {% include 'snippets/reply_form.html' with status=status %}
+        </div>
+    </div>
+</section>
+{% endwith %}
+{% endif %}
+
+{% if status.user == request.user %}
+<section>
+    <input class="toggle-control" type="checkbox" name="more-info-{{ status.id }}" id="more-info-{{ status.id }}">
+    <div class="toggle-content hidden card-footer">
+        {% if status.user == request.user %}
+        <div class="card-footer-item">
+            <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+                {% csrf_token %}
+                <button class="button is-danger is-light" type="submit">
+                    Delete post
+                </button>
+            </form>
+        </div>
+        {% endif %}
+    </div>
+</section>
+{% endif %}
+{% endblock %}