diff --git a/bookwyrm/templates/book/file_links/edit_links.html b/bookwyrm/templates/book/file_links/edit_links.html
index 39d3b998..9048ce7a 100644
--- a/bookwyrm/templates/book/file_links/edit_links.html
+++ b/bookwyrm/templates/book/file_links/edit_links.html
@@ -6,24 +6,24 @@
 
 {% block content %}
 
-<header class="block content">
+<header class="block">
     <h1 class="title">
         {% blocktrans with title=book|book_title %}
         Links for "<em>{{ title }}</em>"
         {% endblocktrans %}
     </h1>
-</header>
 
-<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
-    <ul>
-        <li><a href="{% url 'book' book.id %}">{{ book|book_title }}</a></li>
-        <li class="is-active">
-            <a href="#" aria-current="page">
-                {% trans "Edit links" %}
-            </a>
-        </li>
-    </ul>
-</nav>
+    <nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+        <ul>
+            <li><a href="{% url 'book' book.id %}">{{ book|book_title }}</a></li>
+            <li class="is-active">
+                <a href="#" aria-current="page">
+                    {% trans "Edit links" %}
+                </a>
+            </li>
+        </ul>
+    </nav>
+</header>
 
 <section class="block content">
     <div class="table-container">
diff --git a/bookwyrm/templates/settings/announcements/announcement.html b/bookwyrm/templates/settings/announcements/announcement.html
index 09501382..03f012b4 100644
--- a/bookwyrm/templates/settings/announcements/announcement.html
+++ b/bookwyrm/templates/settings/announcements/announcement.html
@@ -6,7 +6,6 @@
 
 {% block header %}
 {% trans "Announcement" %}
-<a href="{% url 'settings-announcements' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
 {% endblock %}
 
 {% block edit-button %}
@@ -14,7 +13,7 @@
     <div class="control">
         <a class="button" href="{% url 'settings-announcements-edit' announcement.id %}">
             <span class="icon icon-pencil m-0-mobile" aria-hidden="true"></span>
-            <span class="is-sr-only-mobile">{% trans "Edit Announcement" %}</span>
+            <span class="is-sr-only-mobile">{% trans "Edit" %}</span>
         </a>
     </div>
     <form class="control" action="{% url 'settings-announcements-delete' announcement.id %}" method="post">
@@ -27,8 +26,20 @@
 </div>
 {% endblock %}
 
-{% block panel %}
+{% block breadcrumbs %}
+<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+    <ul>
+        <li><a href="{% url 'settings-announcements' %}">{% trans "Announcements" %}</a></li>
+        <li class="is-active">
+            <a href="#" aria-current="page">
+                {{ announcement.preview|truncatechars:30 }}
+            </a>
+        </li>
+    </ul>
+</nav>
+{% endblock %}
 
+{% block panel %}
 <div class="block content">
     <dl>
         <dt class="is-pulled-left mr-5 has-text-weight-bold">{% trans "Visible:" %}</dt>
diff --git a/bookwyrm/templates/settings/announcements/edit_announcement.html b/bookwyrm/templates/settings/announcements/edit_announcement.html
index ef10c2a0..372d6973 100644
--- a/bookwyrm/templates/settings/announcements/edit_announcement.html
+++ b/bookwyrm/templates/settings/announcements/edit_announcement.html
@@ -2,11 +2,31 @@
 {% load i18n %}
 
 {% block header %}
-{% if announcement %}
-{% trans "Edit Announcement" %}
-{% else %}
-{% trans "Create Announcement" %}
-{% endif %}
+    {% if announcement %}
+        {% trans "Edit Announcement" %}
+    {% else %}
+        {% trans "Create Announcement" %}
+    {% endif %}
+{% endblock %}
+
+{% block breadcrumbs %}
+<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
+    <ul>
+        <li><a href="{% url 'settings-announcements' %}">{% trans "Announcements" %}</a></li>
+        {% if announcement %}
+        <li>
+            <a href="{% url 'settings-announcements' announcement.id %}">
+                {{ announcement.preview|truncatechars:30 }}
+            </a>
+        </li>
+        {% endif %}
+        <li class="is-active">
+            <a href="#" aria-current="page">
+                Edit
+            </a>
+        </li>
+    </ul>
+</nav>
 {% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html
index 1addc8db..a74e111c 100644
--- a/bookwyrm/templates/settings/layout.html
+++ b/bookwyrm/templates/settings/layout.html
@@ -9,6 +9,7 @@
     <div class="columns is-mobile">
         <div class="column">
             <h1 class="title">{% block header %}{% endblock %}</h1>
+            {% block breadcrumbs %}{% endblock %}
         </div>
         <div class="column is-narrow">
             {% block edit-button %}{% endblock %}
@@ -16,6 +17,7 @@
     </div>
 </header>
 
+
 <div class="block columns">
     <nav class="menu column is-one-quarter">
         <h2 class="menu-label">