diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 01ef21869..f55f81a09 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -15,14 +15,15 @@
         </p>
     </header>
 
+    {% with tile_classes="tile is-child box has-background-white-ter is-clipped" %}
     <div class="tile is-ancestor">
         <div class="tile is-6 is-parent">
-            <div class="tile is-child box has-background-white-ter">
+            <div class="{{ tile_classes }}">
                 {% include 'discover/large-book.html' with status=large_activities.0 %}
             </div>
         </div>
         <div class="tile is-6 is-parent">
-            <div class="tile is-child box has-background-white-ter">
+            <div class="{{ tile_classes }}">
                 {% include 'discover/large-book.html' with status=large_activities.1 %}
             </div>
         </div>
@@ -31,18 +32,18 @@
     <div class="tile is-ancestor">
         <div class="tile is-vertical is-6">
             <div class="tile is-parent">
-                <div class="tile is-child box has-background-white-ter">
+                <div class="{{ tile_classes }}">
                     {% include 'discover/large-book.html' with status=large_activities.2 %}
                 </div>
             </div>
             <div class="tile">
                 <div class="tile is-parent is-6">
-                    <div class="tile is-child box has-background-white-ter">
+                    <div class="{{ tile_classes }}">
                         {% include 'discover/small-book.html' with status=small_activities.0 %}
                     </div>
                 </div>
                 <div class="tile is-parent is-6">
-                    <div class="tile is-child box has-background-white-ter">
+                    <div class="{{ tile_classes }}">
                         {% include 'discover/small-book.html' with status=small_activities.1 %}
                     </div>
                 </div>
@@ -51,18 +52,18 @@
         <div class="tile is-vertical is-6">
             <div class="tile">
                 <div class="tile is-parent is-6">
-                    <div class="tile is-child box has-background-white-ter">
+                    <div class="{{ tile_classes }}">
                         {% include 'discover/small-book.html' with status=small_activities.2 %}
                     </div>
                 </div>
                 <div class="tile is-parent is-6">
-                    <div class="tile is-child box has-background-white-ter">
+                    <div class="{{ tile_classes }}">
                         {% include 'discover/small-book.html' with status=small_activities.3 %}
                     </div>
                 </div>
             </div>
             <div class="tile is-parent">
-                <div class="tile is-child box has-background-white-ter">
+                <div class="{{ tile_classes }}">
                     {% include 'discover/large-book.html' with status=large_activities.3 %}
                 </div>
             </div>
@@ -71,16 +72,17 @@
 
     <div class="tile is-ancestor">
         <div class="tile is-6 is-parent">
-            <div class="tile is-child box has-background-white-ter">
+            <div class="{{ tile_classes }}">
                 {% include 'discover/large-book.html' with status=large_activities.4 %}
             </div>
         </div>
         <div class="tile is-6 is-parent">
-            <div class="tile is-child box has-background-white-ter">
+            <div class="{{ tile_classes }}">
                 {% include 'discover/large-book.html' with status=large_activities.5 %}
             </div>
         </div>
     </div>
+    {% endwith %}
 </section>
 
 <div class="block">
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c00a0feec..9346207db 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html lang="{% get_lang %}">
 <head>
-    <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
+    <title>{% block title %}BookWyrm{% endblock %} - {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="{% static "css/vendor/bulma.min.css" %}">
     <link rel="stylesheet" href="{% static "css/vendor/icons.css" %}">
@@ -17,8 +17,8 @@
     {% else %}
     <meta name="twitter:card" content="summary">
     {% endif %}
-    <meta name="twitter:title" content="{% if title %}{{ title }} | {% endif %}{{ site.name }}">
-    <meta name="og:title" content="{% if title %}{{ title }} | {% endif %}{{ site.name }}">
+    <meta name="twitter:title" content="{% if title %}{{ title }} - {% endif %}{{ site.name }}">
+    <meta name="og:title" content="{% if title %}{{ title }} - {% endif %}{{ site.name }}">
     <meta name="twitter:description" content="{{ site.instance_tagline }}">
     <meta name="og:description" content="{{ site.instance_tagline }}">
 
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 788ea3950..e62a178f3 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -67,12 +67,18 @@
             {% endif %}
 
             {% if status.content_warning %}
-                <div>
-                    <p>{{ status.content_warning }}</p>
+                <div class="notification p-2 is-clearfix is-warning is-light">
+                    <p class="is-pulled-left is-flex">
+                        {% trans "Content warning" as text %}
+                        <span class="icon icon-warning" title="{{ text }}">
+                            <span class="is-sr-only">{{ text }}</span>
+                        </span>
+                        {{ status.content_warning }}
+                    </p>
 
-                    {% trans "Show more" as button_text %}
+                    {% trans "Show status" as button_text %}
 
-                    {% with text=button_text class="is-small" controls_text="show_status_cw" controls_uid=status.id %}
+                    {% with text=button_text class="is-small is-pulled-right" icon_with_text="arrow-down" controls_text="show_status_cw" controls_uid=status.id %}
                         {% include 'snippets/toggle/open_button.html' %}
                     {% endwith %}
                 </div>
@@ -84,14 +90,6 @@
                     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 %}
-                {% endif %}
-
                 {% if status.quote %}
                     <div class="quote block">
                         <blockquote dir="auto" class="content mb-2">{{ status.quote|safe }}</blockquote>
@@ -141,6 +139,14 @@
                         </div>
                     </div>
                 {% endif %}
+
+                {% if status.content_warning %}
+                    {% trans "Hide status" as button_text %}
+
+                    {% with text=button_text class="is-small" controls_text="show_status_cw" controls_uid=status.id icon_with_text="arrow-up" %}
+                        {% include 'snippets/toggle/close_button.html' %}
+                    {% endwith %}
+                {% endif %}
             </div>
         </article>
     </div>
