diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 049a12b8..2c28a79b 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -7,7 +7,7 @@
         {% if partner %}
         {% blocktrans with username=partner.display_name path=partner.local_path %}Direct Messages with <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
         {% else %}
-        {% trans "Direct Messsages" %}
+        {% trans "Direct Messages" %}
         {% endif %}
     </h1>
     {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 2bbe40e0..0807dea8 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -22,7 +22,7 @@
         <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
             <header class="card-header">
                 <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
+                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
                 </h2>
             </header>
             <section class="card-content content">
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index cbd94305..ab8be717 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -18,6 +18,6 @@
         <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
         <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
     </div>
-    <button class="button is-primary" type="submit">{% trans "Change password" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Change Password" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/preferences_layout.html
index c0f78f95..d463d9cb 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/preferences_layout.html
@@ -14,13 +14,13 @@
                 <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
             </li>
             <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change password" %}</a>
+                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
             </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked users" %}</a>
+                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
             </li>
         </ul>
     </nav>
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 73178ac8..0c3efce7 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -26,7 +26,7 @@
         <ul class="menu-list">
             <li>
                 {% url 'settings-site' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Configuration" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings %}</a>
                 {% if url in request.path %}
                 <ul class="emnu-list">
                     <li><a href="{{ url }}#instance-info">{% trans "Instance Info" %}</a></li>
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index b5a12084..8f6671f7 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -7,7 +7,7 @@
     <input type="hidden" name="reply_parent" value="{{ reply_parent.id }}">
     {% if type == 'review' %}
     <div class="control">
-        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title:" %}</label>
+        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
         <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'">
     </div>
     {% endif %}
@@ -41,7 +41,7 @@
     </div>
     {% if type == 'quotation' %}
     <div class="control">
-        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment:" %}</label>
+        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
         <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
     </div>
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 386c030c..084a5ad0 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -3,7 +3,7 @@
 
 {% block card-header %}
 <h3 class="card-header-title has-background-primary has-text-white">
-    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
+    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
 </h3>
 {% endblock %}
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 4d140e52..c9a87403 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 08:42-0800\n"
+"POT-Creation-Date: 2021-02-28 10:09-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,56 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr ""
 
-#: bookwyrm/templates/author.html:29
+#: bookwyrm/templates/author.html:32
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:34
+#: bookwyrm/templates/author.html:37
 #, python-format
 msgid "Books by %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book.html:43
+#: bookwyrm/templates/book.html:45
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book.html:58
+#: bookwyrm/templates/book.html:60
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book.html:86
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/book.html:104 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
-#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:47
-#: bookwyrm/templates/settings/site.html:86
+#: bookwyrm/templates/book.html:108 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:61
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -75,45 +77,50 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:138
+#: bookwyrm/templates/book.html:140
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:146
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:151
+#: bookwyrm/templates/book.html:153
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:172
+#: bookwyrm/templates/book.html:174
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:178 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:193
+#: bookwyrm/templates/book.html:195
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:204
+#: bookwyrm/templates/book.html:206
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:6
-#: bookwyrm/templates/search_results.html:85
-#: bookwyrm/templates/user/user_layout.html:60
+#: bookwyrm/templates/book.html:217 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:88
+#: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:244
+#: bookwyrm/templates/book.html:246
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/discover/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
@@ -128,162 +135,183 @@ msgstr ""
 msgid "Recent Books"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:15
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:21
+#: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:27
+#: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:42
+#: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:53
+#: bookwyrm/templates/discover/landing_layout.html:55
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
 msgid "Added:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
 msgid "Updated:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
 msgid "Last edited by:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:34
+#: bookwyrm/templates/edit_author.html:37
 msgid "Bio:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:39
+#: bookwyrm/templates/edit_author.html:42
 msgid "Wikipedia link:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:44
+#: bookwyrm/templates/edit_author.html:47
 msgid "Birth date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:49
+#: bookwyrm/templates/edit_author.html:52
 msgid "Death date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:55
+#: bookwyrm/templates/edit_author.html:58
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
 msgid "Openlibrary key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:61
+#: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:66
+#: bookwyrm/templates/edit_author.html:69
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/edit_book.html:31
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:32
+#: bookwyrm/templates/edit_book.html:35
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:40
+#: bookwyrm/templates/edit_book.html:43
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:44
+#: bookwyrm/templates/edit_book.html:47
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:48
+#: bookwyrm/templates/edit_book.html:51
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:52
+#: bookwyrm/templates/edit_book.html:55
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/edit_book.html:68
 #: bookwyrm/templates/snippets/shelf.html:9
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:75
+#: bookwyrm/templates/edit_book.html:78
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:76
+#: bookwyrm/templates/edit_book.html:79
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:84
+#: bookwyrm/templates/edit_book.html:87
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:91
+#: bookwyrm/templates/edit_book.html:94
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:92
+#: bookwyrm/templates/edit_book.html:95
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:96
+#: bookwyrm/templates/edit_book.html:99
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:6
+#: bookwyrm/templates/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:9
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
 
-#: bookwyrm/templates/error.html:6
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr ""
+
+#: bookwyrm/templates/error.html:8
 msgid "Server Error"
 msgstr ""
 
-#: bookwyrm/templates/error.html:7
+#: bookwyrm/templates/error.html:9
 msgid "Something went wrong! Sorry about that."
 msgstr ""
 
-#: bookwyrm/templates/feed/direct_messages.html:7
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, python-format
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+msgid "Direct Messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
 msgstr ""
 
-#: bookwyrm/templates/feed/direct_messages.html:16
+#: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
 msgstr ""
 
@@ -313,21 +341,26 @@ msgid ""
 "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:9
-msgid "Your books"
+#: bookwyrm/templates/feed/feed_layout.html:5
+msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:13
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:68
+#: bookwyrm/templates/feed/feed_layout.html:70 bookwyrm/templates/goal.html:25
+#: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/feed/status.html:7
+#: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr ""
 
@@ -349,102 +382,115 @@ msgstr ""
 msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr ""
 
-#: bookwyrm/templates/import.html:6
+#: bookwyrm/templates/goal.html:50
+#, python-format
+msgid "Your %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:52
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:11
+#: bookwyrm/templates/import.html:14
 msgid "Data source"
 msgstr ""
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:34
+#: bookwyrm/templates/import.html:37
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:38
+#: bookwyrm/templates/import.html:41
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:43
+#: bookwyrm/templates/import.html:46
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import.html:48
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:7
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:14
+#: bookwyrm/templates/import_status.html:17
 msgid "Import completed:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:20
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:23
+#: bookwyrm/templates/import_status.html:26
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:28
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:56
+#: bookwyrm/templates/import_status.html:59
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:62
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:81
+#: bookwyrm/templates/import_status.html:84
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:94
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import_status.html:117
 msgid "Imported"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
 msgid "Create an Account"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:18
+#: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:19
+#: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
@@ -466,18 +512,19 @@ msgid "Feed"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
-#: bookwyrm/templates/notifications.html:7
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
-#: bookwyrm/templates/login.html:31
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
@@ -595,165 +642,172 @@ msgid "Suggest"
 msgstr ""
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created and curated by"
 msgstr ""
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created by"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:11
+#: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:36
+#: bookwyrm/templates/lists/lists.html:39
 msgid "Recent Lists"
 msgstr ""
 
-#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr ""
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:34
+#: bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/login.html:47
+#: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:57
+#: bookwyrm/templates/login.html:59
 msgid "More about this site"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:6
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:7
+#: bookwyrm/templates/notfound.html:9
 msgid "The page your requested doesn't seem to exist!"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:11
+#: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:45
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
-
 #: bookwyrm/templates/notifications.html:48
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:54
+#, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
 "%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:54
+#: bookwyrm/templates/notifications.html:57
 msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:60
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:65
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:67
 msgid "added"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:67
 msgid "suggested adding"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:99
+#: bookwyrm/templates/notifications.html:102
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:8
-#: bookwyrm/templates/password_reset_request.html:8
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:21
-#: bookwyrm/templates/preferences/change_password.html:15
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:28
+#: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:10
+#: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:14
-#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:21
+#: bookwyrm/templates/password_reset_request.html:23
 msgid "Reset password"
 msgstr ""
 
-#: bookwyrm/templates/preferences/blocks.html:5
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
 msgid "Blocked Users"
 msgstr ""
 
-#: bookwyrm/templates/preferences/blocks.html:10
+#: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
 msgstr ""
 
 #: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
 msgid "Change Password"
 msgstr ""
 
-#: bookwyrm/templates/preferences/change_password.html:11
+#: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/change_password.html:18
-#: bookwyrm/templates/preferences/preferences_layout.html:17
-msgid "Change password"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:14
+#: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:21
+#: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:28
+#: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:43
+#: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Manually approve followers:"
 msgstr ""
 
@@ -769,42 +823,42 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:23
-msgid "Blocked users"
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:6
+#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:11
+#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:14
+#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:30
+#: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:53
+#: bookwyrm/templates/search_results.html:56
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:70
+#: bookwyrm/templates/search_results.html:73
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search_results.html:75
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:87
+#: bookwyrm/templates/search_results.html:90
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -819,7 +873,8 @@ msgid "Invites"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:20
-#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/federation.html:6
 msgid "Federated Servers"
 msgstr ""
 
@@ -827,40 +882,35 @@ msgstr ""
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:29
-#: bookwyrm/templates/settings/site.html:3
-msgid "Site Configuration"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:32
-#: bookwyrm/templates/settings/site.html:10
+#: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:33
-#: bookwyrm/templates/settings/site.html:36
+#: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:34
-#: bookwyrm/templates/settings/site.html:56
+#: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:35
-#: bookwyrm/templates/settings/site.html:74
+#: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:12
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:14
 msgid "Status"
 msgstr ""
 
@@ -900,55 +950,60 @@ msgstr ""
 msgid "No active invites"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:12
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:16
+#: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:20
+#: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:24
+#: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:28
+#: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:39
+#: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:43
+#: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:47
+#: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:58
+#: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:62
+#: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:66
+#: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:76
+#: bookwyrm/templates/settings/site.html:79
 msgid "Allow registration:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:80
+#: bookwyrm/templates/settings/site.html:83
 msgid "Registration closed text:"
 msgstr ""
 
@@ -985,6 +1040,7 @@ msgid "Review"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status.html:11
+#: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr ""
 
@@ -1003,10 +1059,6 @@ msgstr ""
 msgid "No rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment:"
-msgstr ""
-
 #: bookwyrm/templates/snippets/create_status_form.html:59
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
@@ -1066,11 +1118,6 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_card.html:6
-#, python-format
-msgid "%(year)s reading goal"
-msgstr ""
-
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
 msgstr ""
@@ -1143,7 +1190,7 @@ msgid "Post privacy"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:17
+#: bookwyrm/templates/user/followers.html:13
 msgid "Followers"
 msgstr ""
 
@@ -1340,7 +1387,7 @@ msgstr ""
 msgid "Remove tag"
 msgstr ""
 
-#: bookwyrm/templates/tag.html:7
+#: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
@@ -1361,73 +1408,101 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/followers.html:30
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+msgid "User Profile"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:26
 #, python-format
 msgid "%(username)s has no followers"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:17
+#: bookwyrm/templates/user/following.html:13
 msgid "Following"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:30
+#: bookwyrm/templates/user/following.html:26
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr ""
 
+#: bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:11
+#, python-format
+msgid "Lists: %(username)s"
+msgstr ""
+
 #: bookwyrm/templates/user/lists.html:28
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:7
-msgid "User profile"
+#: bookwyrm/templates/user/shelf.html:5
+#, python-format
+msgid "Shelves: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:13
+#: bookwyrm/templates/user/shelf.html:11
+msgid "Your Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:13
+#, python-format
+msgid "%(username)s: Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:35
+msgid "Create Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:24
-#: bookwyrm/templates/user/user_layout.html:66
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
 msgid "Shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:29
+#: bookwyrm/templates/user/user.html:31
 #, python-format
 msgid "See all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:42
+#: bookwyrm/templates/user/user.html:44
 #, python-format
 msgid "See all %(shelf_count)s shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:54
+#: bookwyrm/templates/user/user.html:56
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:62
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:63
+#: bookwyrm/templates/user/user.html:65
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:74
+#: bookwyrm/templates/user/user.html:76
 msgid "No activities yet!"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:30
+#: bookwyrm/templates/user/user_layout.html:32
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:48
+#: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:54
+#: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr ""