diff --git a/.env.dev.example b/.env.dev.example
index d4476fd24..1e4fb9812 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -16,7 +16,7 @@ DEFAULT_LANGUAGE="English"
 
 MEDIA_ROOT=images/
 
-POSTGRES_PORT=5432
+PGPORT=5432
 POSTGRES_PASSWORD=securedbypassword123
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
diff --git a/.env.prod.example b/.env.prod.example
index 99520916a..49729d533 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -16,7 +16,7 @@ DEFAULT_LANGUAGE="English"
 
 MEDIA_ROOT=images/
 
-POSTGRES_PORT=5432
+PGPORT=5432
 POSTGRES_PASSWORD=securedbypassword123
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index d20e7e944..24d383ac7 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -101,7 +101,7 @@ class ActivityObject:
             except KeyError:
                 if field.default == MISSING and field.default_factory == MISSING:
                     raise ActivitySerializerError(
-                        "Missing required field: %s" % field.name
+                        f"Missing required field: {field.name}"
                     )
                 value = field.default
             setattr(self, field.name, value)
@@ -213,14 +213,14 @@ class ActivityObject:
         return data
 
 
-@app.task
+@app.task(queue="medium_priority")
 @transaction.atomic
 def set_related_field(
     model_name, origin_model_name, related_field_name, related_remote_id, data
 ):
     """load reverse related fields (editions, attachments) without blocking"""
-    model = apps.get_model("bookwyrm.%s" % model_name, require_ready=True)
-    origin_model = apps.get_model("bookwyrm.%s" % origin_model_name, require_ready=True)
+    model = apps.get_model(f"bookwyrm.{model_name}", require_ready=True)
+    origin_model = apps.get_model(f"bookwyrm.{origin_model_name}", require_ready=True)
 
     with transaction.atomic():
         if isinstance(data, str):
@@ -234,7 +234,7 @@ def set_related_field(
         # this must exist because it's the object that triggered this function
         instance = origin_model.find_existing_by_remote_id(related_remote_id)
         if not instance:
-            raise ValueError("Invalid related remote id: %s" % related_remote_id)
+            raise ValueError(f"Invalid related remote id: {related_remote_id}")
 
         # set the origin's remote id on the activity so it will be there when
         # the model instance is created
@@ -265,7 +265,7 @@ def get_model_from_type(activity_type):
     ]
     if not model:
         raise ActivitySerializerError(
-            'No model found for activity type "%s"' % activity_type
+            f'No model found for activity type "{activity_type}"'
         )
     return model[0]
 
@@ -275,6 +275,8 @@ def resolve_remote_id(
 ):
     """take a remote_id and return an instance, creating if necessary"""
     if model:  # a bonus check we can do if we already know the model
+        if isinstance(model, str):
+            model = apps.get_model(f"bookwyrm.{model}", require_ready=True)
         result = model.find_existing_by_remote_id(remote_id)
         if result and not refresh:
             return result if not get_activity else result.to_activity_dataclass()
@@ -284,7 +286,7 @@ def resolve_remote_id(
         data = get_data(remote_id)
     except ConnectorException:
         raise ActivitySerializerError(
-            "Could not connect to host for remote_id in: %s" % (remote_id)
+            f"Could not connect to host for remote_id: {remote_id}"
         )
     # determine the model implicitly, if not provided
     # or if it's a model with subclasses like Status, check again
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 556ef1853..d61471fe0 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -30,8 +30,8 @@ class Note(ActivityObject):
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
     replies: Dict = field(default_factory=lambda: {})
-    inReplyTo: str = ""
-    summary: str = ""
+    inReplyTo: str = None
+    summary: str = None
     tag: List[Link] = field(default_factory=lambda: [])
     attachment: List[Document] = field(default_factory=lambda: [])
     sensitive: bool = False
@@ -70,6 +70,8 @@ class Quotation(Comment):
     """a quote and commentary on a book"""
 
     quote: str
+    position: int = None
+    positionMode: str = None
     type: str = "Quotation"
 
 
diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index c6ad57608..5e0969e56 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -1,6 +1,9 @@
 """ access the activity streams stored in redis """
+from datetime import timedelta
 from django.dispatch import receiver
+from django.db import transaction
 from django.db.models import signals, Q
+from django.utils import timezone
 
 from bookwyrm import models
 from bookwyrm.redis_store import RedisStore, r
@@ -13,11 +16,12 @@ class ActivityStream(RedisStore):
 
     def stream_id(self, user):
         """the redis key for this user's instance of this stream"""
-        return "{}-{}".format(user.id, self.key)
+        return f"{user.id}-{self.key}"
 
     def unread_id(self, user):
         """the redis key for this user's unread count for this stream"""
-        return "{}-unread".format(self.stream_id(user))
+        stream_id = self.stream_id(user)
+        return f"{stream_id}-unread"
 
     def get_rank(self, obj):  # pylint: disable=no-self-use
         """statuses are sorted by date published"""
@@ -258,38 +262,31 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
         return
 
     if instance.deleted:
-        for stream in streams.values():
-            stream.remove_object_from_related_stores(instance)
+        remove_status_task.delay(instance.id)
         return
 
-    for stream in streams.values():
-        stream.add_status(instance, increment_unread=created)
-
-    if sender != models.Boost:
-        return
-    # remove the original post and other, earlier boosts
-    boosted = instance.boost.boosted_status
-    old_versions = models.Boost.objects.filter(
-        boosted_status__id=boosted.id,
-        created_date__lt=instance.created_date,
+    # when creating new things, gotta wait on the transaction
+    transaction.on_commit(
+        lambda: add_status_on_create_command(sender, instance, created)
     )
-    for stream in streams.values():
-        audience = stream.get_stores_for_object(instance)
-        stream.remove_object_from_related_stores(boosted, stores=audience)
-        for status in old_versions:
-            stream.remove_object_from_related_stores(status, stores=audience)
+
+
+def add_status_on_create_command(sender, instance, created):
+    """runs this code only after the database commit completes"""
+    add_status_task.delay(instance.id, increment_unread=created)
+
+    if sender == models.Boost:
+        handle_boost_task.delay(instance.id)
 
 
 @receiver(signals.post_delete, sender=models.Boost)
 # pylint: disable=unused-argument
 def remove_boost_on_delete(sender, instance, *args, **kwargs):
     """boosts are deleted"""
-    # we're only interested in new statuses
-    for stream in streams.values():
-        # remove the boost
-        stream.remove_object_from_related_stores(instance)
-        # re-add the original status
-        stream.add_status(instance.boosted_status)
+    # remove the boost
+    remove_status_task.delay(instance.id)
+    # re-add the original status
+    add_status_task.delay(instance.boosted_status.id)
 
 
 @receiver(signals.post_save, sender=models.UserFollows)
@@ -298,7 +295,9 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
     """add a newly followed user's statuses to feeds"""
     if not created or not instance.user_subject.local:
         return
-    HomeStream().add_user_statuses(instance.user_subject, instance.user_object)
+    add_user_statuses_task.delay(
+        instance.user_subject.id, instance.user_object.id, stream_list=["home"]
+    )
 
 
 @receiver(signals.post_delete, sender=models.UserFollows)
@@ -307,7 +306,9 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
     """remove statuses from a feed on unfollow"""
     if not instance.user_subject.local:
         return
-    HomeStream().remove_user_statuses(instance.user_subject, instance.user_object)
+    remove_user_statuses_task.delay(
+        instance.user_subject.id, instance.user_object.id, stream_list=["home"]
+    )
 
 
 @receiver(signals.post_save, sender=models.UserBlocks)
@@ -316,13 +317,15 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
     # blocks apply ot all feeds
     if instance.user_subject.local:
-        for stream in streams.values():
-            stream.remove_user_statuses(instance.user_subject, instance.user_object)
+        remove_user_statuses_task.delay(
+            instance.user_subject.id, instance.user_object.id
+        )
 
     # and in both directions
     if instance.user_object.local:
-        for stream in streams.values():
-            stream.remove_user_statuses(instance.user_object, instance.user_subject)
+        remove_user_statuses_task.delay(
+            instance.user_object.id, instance.user_subject.id
+        )
 
 
 @receiver(signals.post_delete, sender=models.UserBlocks)
@@ -330,15 +333,22 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
 def add_statuses_on_unblock(sender, instance, *args, **kwargs):
     """remove statuses from all feeds on block"""
     public_streams = [v for (k, v) in streams.items() if k != "home"]
+
     # add statuses back to streams with statuses from anyone
     if instance.user_subject.local:
-        for stream in public_streams:
-            stream.add_user_statuses(instance.user_subject, instance.user_object)
+        add_user_statuses_task.delay(
+            instance.user_subject.id,
+            instance.user_object.id,
+            stream_list=public_streams,
+        )
 
     # add statuses back to streams with statuses from anyone
     if instance.user_object.local:
-        for stream in public_streams:
-            stream.add_user_statuses(instance.user_object, instance.user_subject)
+        add_user_statuses_task.delay(
+            instance.user_object.id,
+            instance.user_subject.id,
+            stream_list=public_streams,
+        )
 
 
 @receiver(signals.post_save, sender=models.User)
@@ -348,8 +358,8 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
     if not created or not instance.local:
         return
 
-    for stream in streams.values():
-        stream.populate_streams(instance)
+    for stream in streams:
+        populate_stream_task.delay(stream, instance.id)
 
 
 @receiver(signals.pre_save, sender=models.ShelfBook)
@@ -358,20 +368,14 @@ def add_statuses_on_shelve(sender, instance, *args, **kwargs):
     """update books stream when user shelves a book"""
     if not instance.user.local:
         return
-    book = None
-    if hasattr(instance, "book"):
-        book = instance.book
-    elif instance.mention_books.exists():
-        book = instance.mention_books.first()
-    if not book:
-        return
+    book = instance.book
 
     # check if the book is already on the user's shelves
     editions = book.parent_work.editions.all()
     if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
-    BooksStream().add_book_statuses(instance.user, book)
+    add_book_statuses_task.delay(instance.user.id, book.id)
 
 
 @receiver(signals.post_delete, sender=models.ShelfBook)
@@ -381,24 +385,101 @@ def remove_statuses_on_unshelve(sender, instance, *args, **kwargs):
     if not instance.user.local:
         return
 
-    book = None
-    if hasattr(instance, "book"):
-        book = instance.book
-    elif instance.mention_books.exists():
-        book = instance.mention_books.first()
-    if not book:
-        return
+    book = instance.book
+
     # check if the book is actually unshelved, not just moved
     editions = book.parent_work.editions.all()
     if models.ShelfBook.objects.filter(user=instance.user, book__in=editions).exists():
         return
 
-    BooksStream().remove_book_statuses(instance.user, instance.book)
+    remove_book_statuses_task.delay(instance.user.id, book.id)
 
 
-@app.task
+# ---- TASKS
+
+
+@app.task(queue="low_priority")
+def add_book_statuses_task(user_id, book_id):
+    """add statuses related to a book on shelve"""
+    user = models.User.objects.get(id=user_id)
+    book = models.Edition.objects.get(id=book_id)
+    BooksStream().add_book_statuses(user, book)
+
+
+@app.task(queue="low_priority")
+def remove_book_statuses_task(user_id, book_id):
+    """remove statuses about a book from a user's books feed"""
+    user = models.User.objects.get(id=user_id)
+    book = models.Edition.objects.get(id=book_id)
+    BooksStream().remove_book_statuses(user, book)
+
+
+@app.task(queue="medium_priority")
 def populate_stream_task(stream, user_id):
     """background task for populating an empty activitystream"""
     user = models.User.objects.get(id=user_id)
     stream = streams[stream]
     stream.populate_streams(user)
+
+
+@app.task(queue="medium_priority")
+def remove_status_task(status_ids):
+    """remove a status from any stream it might be in"""
+    # this can take an id or a list of ids
+    if not isinstance(status_ids, list):
+        status_ids = [status_ids]
+    statuses = models.Status.objects.filter(id__in=status_ids)
+
+    for stream in streams.values():
+        for status in statuses:
+            stream.remove_object_from_related_stores(status)
+
+
+@app.task(queue="high_priority")
+def add_status_task(status_id, increment_unread=False):
+    """add a status to any stream it should be in"""
+    status = models.Status.objects.get(id=status_id)
+    # we don't want to tick the unread count for csv import statuses, idk how better
+    # to check than just to see if the states is more than a few days old
+    if status.created_date < timezone.now() - timedelta(days=2):
+        increment_unread = False
+    for stream in streams.values():
+        stream.add_status(status, increment_unread=increment_unread)
+
+
+@app.task(queue="medium_priority")
+def remove_user_statuses_task(viewer_id, user_id, stream_list=None):
+    """remove all statuses by a user from a viewer's stream"""
+    stream_list = [streams[s] for s in stream_list] if stream_list else streams.values()
+    viewer = models.User.objects.get(id=viewer_id)
+    user = models.User.objects.get(id=user_id)
+    for stream in stream_list:
+        stream.remove_user_statuses(viewer, user)
+
+
+@app.task(queue="medium_priority")
+def add_user_statuses_task(viewer_id, user_id, stream_list=None):
+    """add all statuses by a user to a viewer's stream"""
+    stream_list = [streams[s] for s in stream_list] if stream_list else streams.values()
+    viewer = models.User.objects.get(id=viewer_id)
+    user = models.User.objects.get(id=user_id)
+    for stream in stream_list:
+        stream.add_user_statuses(viewer, user)
+
+
+@app.task(queue="medium_priority")
+def handle_boost_task(boost_id):
+    """remove the original post and other, earlier boosts"""
+    instance = models.Status.objects.get(id=boost_id)
+    boosted = instance.boost.boosted_status
+
+    old_versions = models.Boost.objects.filter(
+        boosted_status__id=boosted.id,
+        created_date__lt=instance.created_date,
+    )
+
+    for stream in streams.values():
+        audience = stream.get_stores_for_object(instance)
+        stream.remove_object_from_related_stores(boosted, stores=audience)
+        for status in old_versions:
+            stream.remove_object_from_related_stores(status, stores=audience)
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index ffacffdf0..455241cca 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -43,7 +43,7 @@ class AbstractMinimalConnector(ABC):
             params["min_confidence"] = min_confidence
 
         data = self.get_search_data(
-            "%s%s" % (self.search_url, query),
+            f"{self.search_url}{query}",
             params=params,
             timeout=timeout,
         )
@@ -57,7 +57,7 @@ class AbstractMinimalConnector(ABC):
         """isbn search"""
         params = {}
         data = self.get_search_data(
-            "%s%s" % (self.isbn_search_url, query),
+            f"{self.isbn_search_url}{query}",
             params=params,
         )
         results = []
@@ -131,7 +131,7 @@ class AbstractConnector(AbstractMinimalConnector):
                 work_data = data
 
         if not work_data or not edition_data:
-            raise ConnectorException("Unable to load book data: %s" % remote_id)
+            raise ConnectorException(f"Unable to load book data: {remote_id}")
 
         with transaction.atomic():
             # create activitypub object
@@ -222,9 +222,7 @@ def get_data(url, params=None, timeout=10):
     """wrapper for request.get"""
     # check if the url is blocked
     if models.FederatedServer.is_blocked(url):
-        raise ConnectorException(
-            "Attempting to load data from blocked url: {:s}".format(url)
-        )
+        raise ConnectorException(f"Attempting to load data from blocked url: {url}")
 
     try:
         resp = requests.get(
@@ -283,6 +281,7 @@ class SearchResult:
     confidence: int = 1
 
     def __repr__(self):
+        # pylint: disable=consider-using-f-string
         return "<SearchResult key={!r} title={!r} author={!r}>".format(
             self.key, self.title, self.author
         )
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 1a615c9b2..b676e9aa5 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -109,17 +109,17 @@ def get_or_create_connector(remote_id):
         connector_info = models.Connector.objects.create(
             identifier=identifier,
             connector_file="bookwyrm_connector",
-            base_url="https://%s" % identifier,
-            books_url="https://%s/book" % identifier,
-            covers_url="https://%s/images/covers" % identifier,
-            search_url="https://%s/search?q=" % identifier,
+            base_url=f"https://{identifier}",
+            books_url=f"https://{identifier}/book",
+            covers_url=f"https://{identifier}/images/covers",
+            search_url=f"https://{identifier}/search?q=",
             priority=2,
         )
 
     return load_connector(connector_info)
 
 
-@app.task
+@app.task(queue="low_priority")
 def load_more_data(connector_id, book_id):
     """background the work of getting all 10,000 editions of LoTR"""
     connector_info = models.Connector.objects.get(id=connector_id)
@@ -131,7 +131,7 @@ def load_more_data(connector_id, book_id):
 def load_connector(connector_info):
     """instantiate the connector class"""
     connector = importlib.import_module(
-        "bookwyrm.connectors.%s" % connector_info.connector_file
+        f"bookwyrm.connectors.{connector_info.connector_file}"
     )
     return connector.Connector(connector_info.identifier)
 
@@ -141,4 +141,4 @@ def load_connector(connector_info):
 def create_connector(sender, instance, created, *args, **kwargs):
     """create a connector to an external bookwyrm server"""
     if instance.application_type == "bookwyrm":
-        get_or_create_connector("https://{:s}".format(instance.server_name))
+        get_or_create_connector(f"https://{instance.server_name}")
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index d2a7b9faa..704554880 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -59,7 +59,7 @@ class Connector(AbstractConnector):
 
     def get_remote_id(self, value):
         """convert an id/uri into a url"""
-        return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value)
+        return f"{self.books_url}?action=by-uris&uris={value}"
 
     def get_book_data(self, remote_id):
         data = get_data(remote_id)
@@ -87,11 +87,7 @@ class Connector(AbstractConnector):
 
     def format_search_result(self, search_result):
         images = search_result.get("image")
-        cover = (
-            "{:s}/img/entities/{:s}".format(self.covers_url, images[0])
-            if images
-            else None
-        )
+        cover = f"{self.covers_url}/img/entities/{images[0]}" if images else None
         # a deeply messy translation of inventaire's scores
         confidence = float(search_result.get("_score", 0.1))
         confidence = 0.1 if confidence < 150 else 0.999
@@ -99,9 +95,7 @@ class Connector(AbstractConnector):
             title=search_result.get("label"),
             key=self.get_remote_id(search_result.get("uri")),
             author=search_result.get("description"),
-            view_link="{:s}/entity/{:s}".format(
-                self.base_url, search_result.get("uri")
-            ),
+            view_link=f"{self.base_url}/entity/{search_result.get('uri')}",
             cover=cover,
             confidence=confidence,
             connector=self,
@@ -123,9 +117,7 @@ class Connector(AbstractConnector):
             title=title[0],
             key=self.get_remote_id(search_result.get("uri")),
             author=search_result.get("description"),
-            view_link="{:s}/entity/{:s}".format(
-                self.base_url, search_result.get("uri")
-            ),
+            view_link=f"{self.base_url}/entity/{search_result.get('uri')}",
             cover=self.get_cover_url(search_result.get("image")),
             connector=self,
         )
@@ -135,11 +127,7 @@ class Connector(AbstractConnector):
 
     def load_edition_data(self, work_uri):
         """get a list of editions for a work"""
-        url = (
-            "{:s}?action=reverse-claims&property=wdt:P629&value={:s}&sort=true".format(
-                self.books_url, work_uri
-            )
-        )
+        url = f"{self.books_url}?action=reverse-claims&property=wdt:P629&value={work_uri}&sort=true"
         return get_data(url)
 
     def get_edition_from_work_data(self, data):
@@ -195,7 +183,7 @@ class Connector(AbstractConnector):
         # cover may or may not be an absolute url already
         if re.match(r"^http", cover_id):
             return cover_id
-        return "%s%s" % (self.covers_url, cover_id)
+        return f"{self.covers_url}{cover_id}"
 
     def resolve_keys(self, keys):
         """cool, it's "wd:Q3156592" now what the heck does that mean"""
@@ -213,9 +201,7 @@ class Connector(AbstractConnector):
         link = links.get("enwiki")
         if not link:
             return ""
-        url = "{:s}/api/data?action=wp-extract&lang=en&title={:s}".format(
-            self.base_url, link
-        )
+        url = f"{self.base_url}/api/data?action=wp-extract&lang=en&title={link}"
         try:
             data = get_data(url)
         except ConnectorException:
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index e58749c13..fca5d0f71 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -71,7 +71,7 @@ class Connector(AbstractConnector):
             key = data["key"]
         except KeyError:
             raise ConnectorException("Invalid book data")
-        return "%s%s" % (self.books_url, key)
+        return f"{self.books_url}{key}"
 
     def is_work_data(self, data):
         return bool(re.match(r"^[\/\w]+OL\d+W$", data["key"]))
@@ -81,7 +81,7 @@ class Connector(AbstractConnector):
             key = data["key"]
         except KeyError:
             raise ConnectorException("Invalid book data")
-        url = "%s%s/editions" % (self.books_url, key)
+        url = f"{self.books_url}{key}/editions"
         data = self.get_book_data(url)
         edition = pick_default_edition(data["entries"])
         if not edition:
@@ -93,7 +93,7 @@ class Connector(AbstractConnector):
             key = data["works"][0]["key"]
         except (IndexError, KeyError):
             raise ConnectorException("No work found for edition")
-        url = "%s%s" % (self.books_url, key)
+        url = f"{self.books_url}{key}"
         return self.get_book_data(url)
 
     def get_authors_from_data(self, data):
@@ -102,7 +102,7 @@ class Connector(AbstractConnector):
             author_blob = author_blob.get("author", author_blob)
             # this id is "/authors/OL1234567A"
             author_id = author_blob["key"]
-            url = "%s%s" % (self.base_url, author_id)
+            url = f"{self.base_url}{author_id}"
             author = self.get_or_create_author(url)
             if not author:
                 continue
@@ -113,8 +113,8 @@ class Connector(AbstractConnector):
         if not cover_blob:
             return None
         cover_id = cover_blob[0]
-        image_name = "%s-%s.jpg" % (cover_id, size)
-        return "%s/b/id/%s" % (self.covers_url, image_name)
+        image_name = f"{cover_id}-{size}.jpg"
+        return f"{self.covers_url}/b/id/{image_name}"
 
     def parse_search_data(self, data):
         return data.get("docs")
@@ -152,7 +152,7 @@ class Connector(AbstractConnector):
 
     def load_edition_data(self, olkey):
         """query openlibrary for editions of a work"""
-        url = "%s/works/%s/editions" % (self.books_url, olkey)
+        url = f"{self.books_url}/works/{olkey}/editions"
         return self.get_book_data(url)
 
     def expand_book_data(self, book):
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 8d5a7614e..cdb586cb3 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -71,7 +71,7 @@ class Connector(AbstractConnector):
     def format_search_result(self, search_result):
         cover = None
         if search_result.cover:
-            cover = "%s%s" % (self.covers_url, search_result.cover)
+            cover = f"{self.covers_url}{search_result.cover}"
 
         return SearchResult(
             title=search_result.title,
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index 0610a8b9a..309e84ed1 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -15,4 +15,5 @@ def site_settings(request):  # pylint: disable=unused-argument
         "media_full_url": settings.MEDIA_FULL_URL,
         "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES,
         "request_protocol": request_protocol,
+        "js_cache": settings.JS_CACHE,
     }
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index fff3985ef..c6a197f29 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -11,7 +11,7 @@ def email_data():
     """fields every email needs"""
     site = models.SiteSettings.objects.get()
     if site.logo_small:
-        logo_path = "/images/{}".format(site.logo_small.url)
+        logo_path = f"/images/{site.logo_small.url}"
     else:
         logo_path = "/static/images/logo-small.png"
 
@@ -48,23 +48,17 @@ def password_reset_email(reset_code):
 
 def format_email(email_name, data):
     """render the email templates"""
-    subject = (
-        get_template("email/{}/subject.html".format(email_name)).render(data).strip()
-    )
+    subject = get_template(f"email/{email_name}/subject.html").render(data).strip()
     html_content = (
-        get_template("email/{}/html_content.html".format(email_name))
-        .render(data)
-        .strip()
+        get_template(f"email/{email_name}/html_content.html").render(data).strip()
     )
     text_content = (
-        get_template("email/{}/text_content.html".format(email_name))
-        .render(data)
-        .strip()
+        get_template(f"email/{email_name}/text_content.html").render(data).strip()
     )
     return (subject, html_content, text_content)
 
 
-@app.task
+@app.task(queue="high_priority")
 def send_email(recipient, subject, html_content, text_content):
     """use a task to send the email"""
     email = EmailMultiAlternatives(
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index e88124702..b9b93694c 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -101,6 +101,8 @@ class QuotationForm(CustomForm):
             "content_warning",
             "sensitive",
             "privacy",
+            "position",
+            "position_mode",
         ]
 
 
@@ -123,6 +125,12 @@ class StatusForm(CustomForm):
         fields = ["user", "content", "content_warning", "sensitive", "privacy"]
 
 
+class DirectForm(CustomForm):
+    class Meta:
+        model = models.Status
+        fields = ["user", "content", "content_warning", "sensitive", "privacy"]
+
+
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
@@ -132,6 +140,7 @@ class EditUserForm(CustomForm):
             "email",
             "summary",
             "show_goal",
+            "show_suggested_users",
             "manually_approves_followers",
             "default_post_privacy",
             "discoverable",
@@ -219,7 +228,7 @@ class ExpiryWidget(widgets.Select):
         elif selected_string == "forever":
             return None
         else:
-            return selected_string  # "This will raise
+            return selected_string  # This will raise
 
         return timezone.now() + interval
 
@@ -251,10 +260,7 @@ class CreateInviteForm(CustomForm):
                 ]
             ),
             "use_limit": widgets.Select(
-                choices=[
-                    (i, _("%(count)d uses" % {"count": i}))
-                    for i in [1, 5, 10, 25, 50, 100]
-                ]
+                choices=[(i, _(f"{i} uses")) for i in [1, 5, 10, 25, 50, 100]]
                 + [(None, _("Unlimited"))]
             ),
         }
@@ -296,6 +302,18 @@ class ReportForm(CustomForm):
         fields = ["user", "reporter", "statuses", "note"]
 
 
+class EmailBlocklistForm(CustomForm):
+    class Meta:
+        model = models.EmailBlocklist
+        fields = ["domain"]
+
+
+class IPBlocklistForm(CustomForm):
+    class Meta:
+        model = models.IPBlocklist
+        fields = ["address"]
+
+
 class ServerForm(CustomForm):
     class Meta:
         model = models.FederatedServer
diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py
index d5f1449ca..a10b4060c 100644
--- a/bookwyrm/importers/importer.py
+++ b/bookwyrm/importers/importer.py
@@ -3,6 +3,7 @@ import csv
 import logging
 
 from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
 from bookwyrm import models
 from bookwyrm.models import ImportJob, ImportItem
@@ -61,7 +62,7 @@ class Importer:
         job.save()
 
 
-@app.task
+@app.task(queue="low_priority")
 def import_data(source, job_id):
     """does the actual lookup work in a celery task"""
     job = ImportJob.objects.get(id=job_id)
@@ -71,19 +72,20 @@ def import_data(source, job_id):
                 item.resolve()
             except Exception as err:  # pylint: disable=broad-except
                 logger.exception(err)
-                item.fail_reason = "Error loading book"
+                item.fail_reason = _("Error loading book")
                 item.save()
                 continue
 
-            if item.book:
+            if item.book or item.book_guess:
                 item.save()
 
+            if item.book:
                 # shelves book and handles reviews
                 handle_imported_book(
                     source, job.user, item, job.include_reviews, job.privacy
                 )
             else:
-                item.fail_reason = "Could not find a match for book"
+                item.fail_reason = _("Could not find a match for book")
                 item.save()
     finally:
         job.complete = True
@@ -125,6 +127,7 @@ def handle_imported_book(source, user, item, include_reviews, privacy):
         # but "now" is a bad guess
         published_date_guess = item.date_read or item.date_added
         if item.review:
+            # pylint: disable=consider-using-f-string
             review_title = (
                 "Review of {!r} on {!r}".format(
                     item.book.title,
diff --git a/bookwyrm/middleware/__init__.py b/bookwyrm/middleware/__init__.py
new file mode 100644
index 000000000..03843c5a3
--- /dev/null
+++ b/bookwyrm/middleware/__init__.py
@@ -0,0 +1,3 @@
+""" look at all this nice middleware! """
+from .timezone_middleware import TimezoneMiddleware
+from .ip_middleware import IPBlocklistMiddleware
diff --git a/bookwyrm/middleware/ip_middleware.py b/bookwyrm/middleware/ip_middleware.py
new file mode 100644
index 000000000..8063dd1f6
--- /dev/null
+++ b/bookwyrm/middleware/ip_middleware.py
@@ -0,0 +1,16 @@
+""" Block IP addresses """
+from django.http import Http404
+from bookwyrm import models
+
+
+class IPBlocklistMiddleware:
+    """check incoming traffic against an IP block-list"""
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        address = request.META.get("REMOTE_ADDR")
+        if models.IPBlocklist.objects.filter(address=address).exists():
+            raise Http404()
+        return self.get_response(request)
diff --git a/bookwyrm/timezone_middleware.py b/bookwyrm/middleware/timezone_middleware.py
similarity index 100%
rename from bookwyrm/timezone_middleware.py
rename to bookwyrm/middleware/timezone_middleware.py
diff --git a/bookwyrm/migrations/0086_auto_20210827_1727.py b/bookwyrm/migrations/0086_auto_20210827_1727.py
new file mode 100644
index 000000000..ef6af206b
--- /dev/null
+++ b/bookwyrm/migrations/0086_auto_20210827_1727.py
@@ -0,0 +1,40 @@
+# Generated by Django 3.2.4 on 2021-08-27 17:27
+
+from django.db import migrations, models
+import django.db.models.expressions
+
+
+def normalize_readthrough_dates(app_registry, schema_editor):
+    """Find any invalid dates and reset them"""
+    db_alias = schema_editor.connection.alias
+    app_registry.get_model("bookwyrm", "ReadThrough").objects.using(db_alias).filter(
+        start_date__gt=models.F("finish_date")
+    ).update(start_date=models.F("finish_date"))
+
+
+def reverse_func(apps, schema_editor):
+    """nothing to do here"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0085_user_saved_lists"),
+    ]
+
+    operations = [
+        migrations.RunPython(normalize_readthrough_dates, reverse_func),
+        migrations.AlterModelOptions(
+            name="readthrough",
+            options={"ordering": ("-start_date",)},
+        ),
+        migrations.AddConstraint(
+            model_name="readthrough",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ("finish_date__gte", django.db.models.expressions.F("start_date"))
+                ),
+                name="chronology",
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0086_auto_20210828_1724.py b/bookwyrm/migrations/0086_auto_20210828_1724.py
new file mode 100644
index 000000000..212477118
--- /dev/null
+++ b/bookwyrm/migrations/0086_auto_20210828_1724.py
@@ -0,0 +1,49 @@
+# Generated by Django 3.2.4 on 2021-08-28 17:24
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+from django.db.models import F, Value, CharField
+from django.db.models.functions import Concat
+
+
+def forwards_func(apps, schema_editor):
+    """generate followers url"""
+    db_alias = schema_editor.connection.alias
+    apps.get_model("bookwyrm", "User").objects.using(db_alias).annotate(
+        generated_url=Concat(
+            F("remote_id"), Value("/followers"), output_field=CharField()
+        )
+    ).update(followers_url=models.F("generated_url"))
+
+
+def reverse_func(apps, schema_editor):
+    """noop"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0085_user_saved_lists"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="followers_url",
+            field=bookwyrm.models.fields.CharField(
+                default="/followers", max_length=255
+            ),
+            preserve_default=False,
+        ),
+        migrations.RunPython(forwards_func, reverse_func),
+        migrations.AlterField(
+            model_name="user",
+            name="followers",
+            field=models.ManyToManyField(
+                related_name="following",
+                through="bookwyrm.UserFollows",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py b/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py
new file mode 100644
index 000000000..cd5311619
--- /dev/null
+++ b/bookwyrm/migrations/0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2021-08-29 18:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0086_auto_20210827_1727"),
+        ("bookwyrm", "0086_auto_20210828_1724"),
+    ]
+
+    operations = []
diff --git a/bookwyrm/migrations/0088_auto_20210905_2233.py b/bookwyrm/migrations/0088_auto_20210905_2233.py
new file mode 100644
index 000000000..028cf7bf7
--- /dev/null
+++ b/bookwyrm/migrations/0088_auto_20210905_2233.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.2.4 on 2021-09-05 22:33
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="quotation",
+            name="position",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+            ),
+        ),
+        migrations.AddField(
+            model_name="quotation",
+            name="position_mode",
+            field=models.CharField(
+                blank=True,
+                choices=[("PG", "page"), ("PCT", "percent")],
+                default="PG",
+                max_length=3,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0089_user_show_suggested_users.py b/bookwyrm/migrations/0089_user_show_suggested_users.py
new file mode 100644
index 000000000..047bb974c
--- /dev/null
+++ b/bookwyrm/migrations/0089_user_show_suggested_users.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-09-08 16:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0088_auto_20210905_2233"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="show_suggested_users",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0090_auto_20210908_2346.py b/bookwyrm/migrations/0090_auto_20210908_2346.py
new file mode 100644
index 000000000..7c8708573
--- /dev/null
+++ b/bookwyrm/migrations/0090_auto_20210908_2346.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.2.4 on 2021-09-08 23:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0089_user_show_suggested_users"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="connector",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_suspension", "Moderator Suspension"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_suspension", "Moderator Suspension"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0090_emailblocklist.py b/bookwyrm/migrations/0090_emailblocklist.py
new file mode 100644
index 000000000..6934e51e9
--- /dev/null
+++ b/bookwyrm/migrations/0090_emailblocklist.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.4 on 2021-09-08 22:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0089_user_show_suggested_users"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EmailBlocklist",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("domain", models.CharField(max_length=255, unique=True)),
+            ],
+            options={
+                "ordering": ("-created_date",),
+            },
+        ),
+    ]
diff --git a/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py b/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py
new file mode 100644
index 000000000..7aae2c7a6
--- /dev/null
+++ b/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2021-09-09 00:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0090_auto_20210908_2346"),
+        ("bookwyrm", "0090_emailblocklist"),
+    ]
+
+    operations = []
diff --git a/bookwyrm/migrations/0092_sitesettings_instance_short_description.py b/bookwyrm/migrations/0092_sitesettings_instance_short_description.py
new file mode 100644
index 000000000..4c62dd7be
--- /dev/null
+++ b/bookwyrm/migrations/0092_sitesettings_instance_short_description.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-09-10 18:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0091_merge_0090_auto_20210908_2346_0090_emailblocklist"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sitesettings",
+            name="instance_short_description",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0093_alter_sitesettings_instance_short_description.py b/bookwyrm/migrations/0093_alter_sitesettings_instance_short_description.py
new file mode 100644
index 000000000..165199be7
--- /dev/null
+++ b/bookwyrm/migrations/0093_alter_sitesettings_instance_short_description.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.4 on 2021-09-10 19:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0092_sitesettings_instance_short_description"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sitesettings",
+            name="instance_short_description",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0094_auto_20210911_1550.py b/bookwyrm/migrations/0094_auto_20210911_1550.py
new file mode 100644
index 000000000..8c3be9f89
--- /dev/null
+++ b/bookwyrm/migrations/0094_auto_20210911_1550.py
@@ -0,0 +1,39 @@
+# Generated by Django 3.2.4 on 2021-09-11 15:50
+
+from django.db import migrations, models
+from django.db.models import F, Value, CharField
+
+
+def set_deactivate_date(apps, schema_editor):
+    """best-guess for deactivation date"""
+    db_alias = schema_editor.connection.alias
+    apps.get_model("bookwyrm", "User").objects.using(db_alias).filter(
+        is_active=False
+    ).update(deactivation_date=models.F("last_active_date"))
+
+
+def reverse_func(apps, schema_editor):
+    """noop"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0093_alter_sitesettings_instance_short_description"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="deactivation_date",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="saved_lists",
+            field=models.ManyToManyField(
+                blank=True, related_name="saved_lists", to="bookwyrm.List"
+            ),
+        ),
+        migrations.RunPython(set_deactivate_date, reverse_func),
+    ]
diff --git a/bookwyrm/migrations/0094_importitem_book_guess.py b/bookwyrm/migrations/0094_importitem_book_guess.py
new file mode 100644
index 000000000..be703cdde
--- /dev/null
+++ b/bookwyrm/migrations/0094_importitem_book_guess.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.4 on 2021-09-11 14:22
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0093_alter_sitesettings_instance_short_description"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="importitem",
+            name="book_guess",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="book_guess",
+                to="bookwyrm.book",
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0095_auto_20210911_2053.py b/bookwyrm/migrations/0095_auto_20210911_2053.py
new file mode 100644
index 000000000..06d15f5e6
--- /dev/null
+++ b/bookwyrm/migrations/0095_auto_20210911_2053.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.2.4 on 2021-09-11 20:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0094_auto_20210911_1550"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="connector",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self deletion"),
+                    ("moderator_suspension", "Moderator suspension"),
+                    ("moderator_deletion", "Moderator deletion"),
+                    ("domain_block", "Domain block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("pending", "Pending"),
+                    ("self_deletion", "Self deletion"),
+                    ("moderator_suspension", "Moderator suspension"),
+                    ("moderator_deletion", "Moderator deletion"),
+                    ("domain_block", "Domain block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0095_merge_20210911_2143.py b/bookwyrm/migrations/0095_merge_20210911_2143.py
new file mode 100644
index 000000000..ea6b5a346
--- /dev/null
+++ b/bookwyrm/migrations/0095_merge_20210911_2143.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2021-09-11 21:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0094_auto_20210911_1550"),
+        ("bookwyrm", "0094_importitem_book_guess"),
+    ]
+
+    operations = []
diff --git a/bookwyrm/migrations/0096_merge_20210912_0044.py b/bookwyrm/migrations/0096_merge_20210912_0044.py
new file mode 100644
index 000000000..0d3b69a20
--- /dev/null
+++ b/bookwyrm/migrations/0096_merge_20210912_0044.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2021-09-12 00:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0095_auto_20210911_2053"),
+        ("bookwyrm", "0095_merge_20210911_2143"),
+    ]
+
+    operations = []
diff --git a/bookwyrm/migrations/0097_auto_20210917_1858.py b/bookwyrm/migrations/0097_auto_20210917_1858.py
new file mode 100644
index 000000000..28cf94e25
--- /dev/null
+++ b/bookwyrm/migrations/0097_auto_20210917_1858.py
@@ -0,0 +1,38 @@
+# Generated by Django 3.2.4 on 2021-09-17 18:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0096_merge_20210912_0044"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="IPBlocklist",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("address", models.CharField(max_length=255, unique=True)),
+                ("is_active", models.BooleanField(default=True)),
+            ],
+            options={
+                "ordering": ("-created_date",),
+            },
+        ),
+        migrations.AddField(
+            model_name="emailblocklist",
+            name="is_active",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0098_auto_20210918_2238.py b/bookwyrm/migrations/0098_auto_20210918_2238.py
new file mode 100644
index 000000000..09fdba317
--- /dev/null
+++ b/bookwyrm/migrations/0098_auto_20210918_2238.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.4 on 2021-09-18 22:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0097_auto_20210917_1858"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sitesettings",
+            name="invite_request_text",
+            field=models.TextField(
+                default="If your request is approved, you will receive an email with a registration link."
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sitesettings",
+            name="registration_closed_text",
+            field=models.TextField(
+                default='We aren\'t taking new users at this time. You can find an open instance at <a href="https://joinbookwyrm.com/instances">joinbookwyrm.com/instances</a>.'
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0099_readthrough_is_active.py b/bookwyrm/migrations/0099_readthrough_is_active.py
new file mode 100644
index 000000000..e7b177bad
--- /dev/null
+++ b/bookwyrm/migrations/0099_readthrough_is_active.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.2.4 on 2021-09-22 16:53
+
+from django.db import migrations, models
+
+
+def set_active_readthrough(apps, schema_editor):
+    """best-guess for deactivation date"""
+    db_alias = schema_editor.connection.alias
+    apps.get_model("bookwyrm", "ReadThrough").objects.using(db_alias).filter(
+        start_date__isnull=False,
+        finish_date__isnull=True,
+    ).update(is_active=True)
+
+
+def reverse_func(apps, schema_editor):
+    """noop"""
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0098_auto_20210918_2238"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="readthrough",
+            name="is_active",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(set_active_readthrough, reverse_func),
+        migrations.AlterField(
+            model_name="readthrough",
+            name="is_active",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 6f378e83c..bffd62b45 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -14,7 +14,6 @@ from .status import Review, ReviewRating
 from .status import Boost
 from .attachment import Image
 from .favorite import Favorite
-from .notification import Notification
 from .readthrough import ReadThrough, ProgressUpdate, ProgressMode
 
 from .user import User, KeyPair, AnnualGoal
@@ -24,8 +23,12 @@ from .federated_server import FederatedServer
 
 from .import_job import ImportJob, ImportItem
 
-from .site import SiteSettings, SiteInvite, PasswordReset, InviteRequest
+from .site import SiteSettings, SiteInvite
+from .site import PasswordReset, InviteRequest
 from .announcement import Announcement
+from .antispam import EmailBlocklist, IPBlocklist
+
+from .notification import Notification
 
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
 activity_models = {
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4e313723a..3a88c5249 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -266,7 +266,7 @@ class ObjectMixin(ActivitypubMixin):
             signed_message = signer.sign(SHA256.new(content.encode("utf8")))
 
             signature = activitypub.Signature(
-                creator="%s#main-key" % user.remote_id,
+                creator=f"{user.remote_id}#main-key",
                 created=activity_object.published,
                 signatureValue=b64encode(signed_message).decode("utf8"),
             )
@@ -285,16 +285,16 @@ class ObjectMixin(ActivitypubMixin):
         return activitypub.Delete(
             id=self.remote_id + "/activity",
             actor=user.remote_id,
-            to=["%s/followers" % user.remote_id],
+            to=[f"{user.remote_id}/followers"],
             cc=["https://www.w3.org/ns/activitystreams#Public"],
             object=self,
         ).serialize()
 
     def to_update_activity(self, user):
         """wrapper for Updates to an activity"""
-        activity_id = "%s#update/%s" % (self.remote_id, uuid4())
+        uuid = uuid4()
         return activitypub.Update(
-            id=activity_id,
+            id=f"{self.remote_id}#update/{uuid}",
             actor=user.remote_id,
             to=["https://www.w3.org/ns/activitystreams#Public"],
             object=self,
@@ -337,8 +337,8 @@ class OrderedCollectionPageMixin(ObjectMixin):
         paginated = Paginator(queryset, PAGE_LENGTH)
         # add computed fields specific to orderd collections
         activity["totalItems"] = paginated.count
-        activity["first"] = "%s?page=1" % remote_id
-        activity["last"] = "%s?page=%d" % (remote_id, paginated.num_pages)
+        activity["first"] = f"{remote_id}?page=1"
+        activity["last"] = f"{remote_id}?page={paginated.num_pages}"
 
         return serializer(**activity)
 
@@ -362,6 +362,13 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
             self.collection_queryset, **kwargs
         ).serialize()
 
+    def delete(self, *args, broadcast=True, **kwargs):
+        """Delete the object"""
+        activity = self.to_delete_activity(self.user)
+        super().delete(*args, **kwargs)
+        if self.user.local and broadcast:
+            self.broadcast(activity, self.user)
+
 
 class CollectionItemMixin(ActivitypubMixin):
     """for items that are part of an (Ordered)Collection"""
@@ -413,7 +420,7 @@ class CollectionItemMixin(ActivitypubMixin):
         """AP for shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id="{:s}#add".format(collection_field.remote_id),
+            id=f"{collection_field.remote_id}#add",
             actor=user.remote_id,
             object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
@@ -423,7 +430,7 @@ class CollectionItemMixin(ActivitypubMixin):
         """AP for un-shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id="{:s}#remove".format(collection_field.remote_id),
+            id=f"{collection_field.remote_id}#remove",
             actor=user.remote_id,
             object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
@@ -451,7 +458,7 @@ class ActivityMixin(ActivitypubMixin):
         """undo an action"""
         user = self.user if hasattr(self, "user") else self.user_subject
         return activitypub.Undo(
-            id="%s#undo" % self.remote_id,
+            id=f"{self.remote_id}#undo",
             actor=user.remote_id,
             object=self,
         ).serialize()
@@ -495,7 +502,7 @@ def unfurl_related_field(related_field, sort_field=None):
     return related_field.remote_id
 
 
-@app.task
+@app.task(queue="medium_priority")
 def broadcast_task(sender_id, activity, recipients):
     """the celery task for broadcast"""
     user_model = apps.get_model("bookwyrm.User", require_ready=True)
@@ -548,11 +555,11 @@ def to_ordered_collection_page(
 
     prev_page = next_page = None
     if activity_page.has_next():
-        next_page = "%s?page=%d" % (remote_id, activity_page.next_page_number())
+        next_page = f"{remote_id}?page={activity_page.next_page_number()}"
     if activity_page.has_previous():
-        prev_page = "%s?page=%d" % (remote_id, activity_page.previous_page_number())
+        prev_page = f"{remote_id}?page=%d{activity_page.previous_page_number()}"
     return activitypub.OrderedCollectionPage(
-        id="%s?page=%s" % (remote_id, page),
+        id=f"{remote_id}?page={page}",
         partOf=remote_id,
         orderedItems=items,
         next=next_page,
diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py
new file mode 100644
index 000000000..7a85bbcf0
--- /dev/null
+++ b/bookwyrm/models/antispam.py
@@ -0,0 +1,35 @@
+""" Lets try NOT to sell viagra """
+from django.db import models
+
+from .user import User
+
+
+class EmailBlocklist(models.Model):
+    """blocked email addresses"""
+
+    created_date = models.DateTimeField(auto_now_add=True)
+    domain = models.CharField(max_length=255, unique=True)
+    is_active = models.BooleanField(default=True)
+
+    class Meta:
+        """default sorting"""
+
+        ordering = ("-created_date",)
+
+    @property
+    def users(self):
+        """find the users associated with this address"""
+        return User.objects.filter(email__endswith=f"@{self.domain}")
+
+
+class IPBlocklist(models.Model):
+    """blocked ip addresses"""
+
+    created_date = models.DateTimeField(auto_now_add=True)
+    address = models.CharField(max_length=255, unique=True)
+    is_active = models.BooleanField(default=True)
+
+    class Meta:
+        """default sorting"""
+
+        ordering = ("-created_date",)
diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py
index 6da80b176..53cf94ff4 100644
--- a/bookwyrm/models/author.py
+++ b/bookwyrm/models/author.py
@@ -35,7 +35,7 @@ class Author(BookDataModel):
 
     def get_remote_id(self):
         """editions and works both use "book" instead of model_name"""
-        return "https://%s/author/%s" % (DOMAIN, self.id)
+        return f"https://{DOMAIN}/author/{self.id}"
 
     activity_serializer = activitypub.Author
 
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 5b55ea50f..ca32521a3 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -1,22 +1,24 @@
 """ base model with default fields """
 import base64
 from Crypto import Random
+
+from django.core.exceptions import PermissionDenied
 from django.db import models
 from django.dispatch import receiver
+from django.http import Http404
+from django.utils.translation import gettext_lazy as _
 
 from bookwyrm.settings import DOMAIN
 from .fields import RemoteIdField
 
 
-DeactivationReason = models.TextChoices(
-    "DeactivationReason",
-    [
-        "pending",
-        "self_deletion",
-        "moderator_deletion",
-        "domain_block",
-    ],
-)
+DeactivationReason = [
+    ("pending", _("Pending")),
+    ("self_deletion", _("Self deletion")),
+    ("moderator_suspension", _("Moderator suspension")),
+    ("moderator_deletion", _("Moderator deletion")),
+    ("domain_block", _("Domain block")),
+]
 
 
 def new_access_code():
@@ -33,11 +35,11 @@ class BookWyrmModel(models.Model):
 
     def get_remote_id(self):
         """generate a url that resolves to the local object"""
-        base_path = "https://%s" % DOMAIN
+        base_path = f"https://{DOMAIN}"
         if hasattr(self, "user"):
-            base_path = "%s%s" % (base_path, self.user.local_path)
+            base_path = f"{base_path}{self.user.local_path}"
         model_name = type(self).__name__.lower()
-        return "%s/%s/%d" % (base_path, model_name, self.id)
+        return f"{base_path}/{model_name}/{self.id}"
 
     class Meta:
         """this is just here to provide default fields for other models"""
@@ -47,28 +49,28 @@ class BookWyrmModel(models.Model):
     @property
     def local_path(self):
         """how to link to this object in the local app"""
-        return self.get_remote_id().replace("https://%s" % DOMAIN, "")
+        return self.get_remote_id().replace(f"https://{DOMAIN}", "")
 
-    def visible_to_user(self, viewer):
+    def raise_visible_to_user(self, viewer):
         """is a user authorized to view an object?"""
         # make sure this is an object with privacy owned by a user
         if not hasattr(self, "user") or not hasattr(self, "privacy"):
-            return None
+            return
 
         # viewer can't see it if the object's owner blocked them
         if viewer in self.user.blocks.all():
-            return False
+            raise Http404()
 
         # you can see your own posts and any public or unlisted posts
         if viewer == self.user or self.privacy in ["public", "unlisted"]:
-            return True
+            return
 
         # you can see the followers only posts of people you follow
         if (
             self.privacy == "followers"
             and self.user.followers.filter(id=viewer.id).first()
         ):
-            return True
+            return
 
         # you can see dms you are tagged in
         if hasattr(self, "mention_users"):
@@ -76,8 +78,32 @@ class BookWyrmModel(models.Model):
                 self.privacy == "direct"
                 and self.mention_users.filter(id=viewer.id).first()
             ):
-                return True
-        return False
+                return
+        raise Http404()
+
+    def raise_not_editable(self, viewer):
+        """does this user have permission to edit this object? liable to be overwritten
+        by models that inherit this base model class"""
+        if not hasattr(self, "user"):
+            return
+
+        # generally moderators shouldn't be able to edit other people's stuff
+        if self.user == viewer:
+            return
+
+        raise PermissionDenied()
+
+    def raise_not_deletable(self, viewer):
+        """does this user have permission to delete this object? liable to be
+        overwritten by models that inherit this base model class"""
+        if not hasattr(self, "user"):
+            return
+
+        # but generally moderators can delete other people's stuff
+        if self.user == viewer or viewer.has_perm("moderate_post"):
+            return
+
+        raise PermissionDenied()
 
 
 @receiver(models.signals.post_save)
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 8bed69249..6f26ef7d1 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -3,7 +3,8 @@ import re
 
 from django.contrib.postgres.search import SearchVectorField
 from django.contrib.postgres.indexes import GinIndex
-from django.db import models
+from django.db import models, transaction
+from django.db.models import Prefetch
 from django.dispatch import receiver
 from model_utils import FieldTracker
 from model_utils.managers import InheritanceManager
@@ -163,9 +164,9 @@ class Book(BookDataModel):
     @property
     def alt_text(self):
         """image alt test"""
-        text = "%s" % self.title
+        text = self.title
         if self.edition_info:
-            text += " (%s)" % self.edition_info
+            text += f" ({self.edition_info})"
         return text
 
     def save(self, *args, **kwargs):
@@ -176,9 +177,10 @@ class Book(BookDataModel):
 
     def get_remote_id(self):
         """editions and works both use "book" instead of model_name"""
-        return "https://%s/book/%d" % (DOMAIN, self.id)
+        return f"https://{DOMAIN}/book/{self.id}"
 
     def __repr__(self):
+        # pylint: disable=consider-using-f-string
         return "<{} key={!r} title={!r}>".format(
             self.__class__,
             self.openlibrary_key,
@@ -215,7 +217,7 @@ class Work(OrderedCollectionPageMixin, Book):
         """an ordered collection of editions"""
         return self.to_ordered_collection(
             self.editions.order_by("-edition_rank").all(),
-            remote_id="%s/editions" % self.remote_id,
+            remote_id=f"{self.remote_id}/editions",
             **kwargs,
         )
 
@@ -305,6 +307,27 @@ class Edition(Book):
 
         return super().save(*args, **kwargs)
 
+    @classmethod
+    def viewer_aware_objects(cls, viewer):
+        """annotate a book query with metadata related to the user"""
+        queryset = cls.objects
+        if not viewer or not viewer.is_authenticated:
+            return queryset
+
+        queryset = queryset.prefetch_related(
+            Prefetch(
+                "shelfbook_set",
+                queryset=viewer.shelfbook_set.all(),
+                to_attr="current_shelves",
+            ),
+            Prefetch(
+                "readthrough_set",
+                queryset=viewer.readthrough_set.filter(is_active=True).all(),
+                to_attr="active_readthroughs",
+            ),
+        )
+        return queryset
+
 
 def isbn_10_to_13(isbn_10):
     """convert an isbn 10 into an isbn 13"""
@@ -361,4 +384,6 @@ def preview_image(instance, *args, **kwargs):
         changed_fields = instance.field_tracker.changed()
 
     if len(changed_fields) > 0:
-        generate_edition_preview_image_task.delay(instance.id)
+        transaction.on_commit(
+            lambda: generate_edition_preview_image_task.delay(instance.id)
+        )
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 2d6717908..9d2c6aeb3 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -19,7 +19,7 @@ class Connector(BookWyrmModel):
     api_key = models.CharField(max_length=255, null=True, blank=True)
     active = models.BooleanField(default=True)
     deactivation_reason = models.CharField(
-        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+        max_length=255, choices=DeactivationReason, null=True, blank=True
     )
 
     base_url = models.CharField(max_length=255)
@@ -29,7 +29,4 @@ class Connector(BookWyrmModel):
     isbn_search_url = models.CharField(max_length=255, null=True, blank=True)
 
     def __str__(self):
-        return "{} ({})".format(
-            self.identifier,
-            self.id,
-        )
+        return f"{self.identifier} ({self.id})"
diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index 9ab300b3c..4c3675219 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -1,7 +1,5 @@
 """ like/fav/star a status """
-from django.apps import apps
 from django.db import models
-from django.utils import timezone
 
 from bookwyrm import activitypub
 from .activitypub_mixin import ActivityMixin
@@ -29,38 +27,9 @@ class Favorite(ActivityMixin, BookWyrmModel):
 
     def save(self, *args, **kwargs):
         """update user active time"""
-        self.user.last_active_date = timezone.now()
-        self.user.save(broadcast=False, update_fields=["last_active_date"])
+        self.user.update_active_date()
         super().save(*args, **kwargs)
 
-        if self.status.user.local and self.status.user != self.user:
-            notification_model = apps.get_model(
-                "bookwyrm.Notification", require_ready=True
-            )
-            notification_model.objects.create(
-                user=self.status.user,
-                notification_type="FAVORITE",
-                related_user=self.user,
-                related_status=self.status,
-            )
-
-    def delete(self, *args, **kwargs):
-        """delete and delete notifications"""
-        # check for notification
-        if self.status.user.local:
-            notification_model = apps.get_model(
-                "bookwyrm.Notification", require_ready=True
-            )
-            notification = notification_model.objects.filter(
-                user=self.status.user,
-                related_user=self.user,
-                related_status=self.status,
-                notification_type="FAVORITE",
-            ).first()
-            if notification:
-                notification.delete()
-        super().delete(*args, **kwargs)
-
     class Meta:
         """can't fav things twice"""
 
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index e297c46c4..eb03d457e 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -1,16 +1,16 @@
 """ connections to external ActivityPub servers """
 from urllib.parse import urlparse
+
 from django.apps import apps
 from django.db import models
+from django.utils.translation import gettext_lazy as _
+
 from .base_model import BookWyrmModel
 
-FederationStatus = models.TextChoices(
-    "Status",
-    [
-        "federated",
-        "blocked",
-    ],
-)
+FederationStatus = [
+    ("federated", _("Federated")),
+    ("blocked", _("Blocked")),
+]
 
 
 class FederatedServer(BookWyrmModel):
@@ -18,7 +18,7 @@ class FederatedServer(BookWyrmModel):
 
     server_name = models.CharField(max_length=255, unique=True)
     status = models.CharField(
-        max_length=255, default="federated", choices=FederationStatus.choices
+        max_length=255, default="federated", choices=FederationStatus
     )
     # is it mastodon, bookwyrm, etc
     application_type = models.CharField(max_length=255, null=True, blank=True)
@@ -28,7 +28,7 @@ class FederatedServer(BookWyrmModel):
     def block(self):
         """block a server"""
         self.status = "blocked"
-        self.save()
+        self.save(update_fields=["status"])
 
         # deactivate all associated users
         self.user_set.filter(is_active=True).update(
@@ -45,7 +45,7 @@ class FederatedServer(BookWyrmModel):
     def unblock(self):
         """unblock a server"""
         self.status = "federated"
-        self.save()
+        self.save(update_fields=["status"])
 
         self.user_set.filter(deactivation_reason="domain_block").update(
             is_active=True, deactivation_reason=None
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 6ed5aa5e6..ccd669cbf 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -56,7 +56,7 @@ class ActivitypubFieldMixin:
         activitypub_field=None,
         activitypub_wrapper=None,
         deduplication_field=False,
-        **kwargs
+        **kwargs,
     ):
         self.deduplication_field = deduplication_field
         if activitypub_wrapper:
@@ -224,8 +224,20 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         original = getattr(instance, self.name)
         to = data.to
         cc = data.cc
+
+        # we need to figure out who this is to get their followers link
+        for field in ["attributedTo", "owner", "actor"]:
+            if hasattr(data, field):
+                user_field = field
+                break
+        if not user_field:
+            raise ValidationError("No user field found for privacy", data)
+        user = activitypub.resolve_remote_id(getattr(data, user_field), model="User")
+
         if to == [self.public]:
             setattr(instance, self.name, "public")
+        elif to == [user.followers_url]:
+            setattr(instance, self.name, "followers")
         elif cc == []:
             setattr(instance, self.name, "direct")
         elif self.public in cc:
@@ -241,9 +253,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
             mentions = [u.remote_id for u in instance.mention_users.all()]
         # this is a link to the followers list
         # pylint: disable=protected-access
-        followers = instance.user.__class__._meta.get_field(
-            "followers"
-        ).field_to_activity(instance.user.followers)
+        followers = instance.user.followers_url
         if instance.privacy == "public":
             activity["to"] = [self.public]
             activity["cc"] = [followers] + mentions
@@ -298,7 +308,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
 
     def field_to_activity(self, value):
         if self.link_only:
-            return "%s/%s" % (value.instance.remote_id, self.name)
+            return f"{value.instance.remote_id}/{self.name}"
         return [i.remote_id for i in value.all()]
 
     def field_from_activity(self, value):
@@ -378,7 +388,7 @@ def image_serializer(value, alt):
     else:
         return None
     if not url[:4] == "http":
-        url = "https://{:s}{:s}".format(DOMAIN, url)
+        url = f"https://{DOMAIN}{url}"
     return activitypub.Document(url=url, name=alt)
 
 
@@ -438,7 +448,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
 
         image_content = ContentFile(response.content)
         extension = imghdr.what(None, image_content.read()) or ""
-        image_name = "{:s}.{:s}".format(str(uuid4()), extension)
+        image_name = f"{uuid4()}.{extension}"
         return [image_name, image_content]
 
     def formfield(self, **kwargs):
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 05aada161..22253fef7 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -2,7 +2,6 @@
 import re
 import dateutil.parser
 
-from django.apps import apps
 from django.db import models
 from django.utils import timezone
 
@@ -50,19 +49,6 @@ class ImportJob(models.Model):
     )
     retry = models.BooleanField(default=False)
 
-    def save(self, *args, **kwargs):
-        """save and notify"""
-        super().save(*args, **kwargs)
-        if self.complete:
-            notification_model = apps.get_model(
-                "bookwyrm.Notification", require_ready=True
-            )
-            notification_model.objects.create(
-                user=self.user,
-                notification_type="IMPORT",
-                related_import=self,
-            )
-
 
 class ImportItem(models.Model):
     """a single line of a csv being imported"""
@@ -71,6 +57,13 @@ class ImportItem(models.Model):
     index = models.IntegerField()
     data = models.JSONField()
     book = models.ForeignKey(Book, on_delete=models.SET_NULL, null=True, blank=True)
+    book_guess = models.ForeignKey(
+        Book,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="book_guess",
+    )
     fail_reason = models.TextField(null=True)
 
     def resolve(self):
@@ -78,9 +71,13 @@ class ImportItem(models.Model):
         if self.isbn:
             self.book = self.get_book_from_isbn()
         else:
-            # don't fall back on title/author search is isbn is present.
+            # don't fall back on title/author search if isbn is present.
             # you're too likely to mismatch
-            self.book = self.get_book_from_title_author()
+            book, confidence = self.get_book_from_title_author()
+            if confidence > 0.999:
+                self.book = book
+            else:
+                self.book_guess = book
 
     def get_book_from_isbn(self):
         """search by isbn"""
@@ -96,12 +93,15 @@ class ImportItem(models.Model):
         """search by title and author"""
         search_term = construct_search_term(self.title, self.author)
         search_result = connector_manager.first_search_result(
-            search_term, min_confidence=0.999
+            search_term, min_confidence=0.1
         )
         if search_result:
             # raises ConnectorException
-            return search_result.connector.get_or_create_book(search_result.key)
-        return None
+            return (
+                search_result.connector.get_or_create_book(search_result.key),
+                search_result.confidence,
+            )
+        return None, 0
 
     @property
     def title(self):
@@ -174,6 +174,7 @@ class ImportItem(models.Model):
         if start_date and start_date is not None and not self.date_read:
             return [ReadThrough(start_date=start_date)]
         if self.date_read:
+            start_date = start_date if start_date < self.date_read else None
             return [
                 ReadThrough(
                     start_date=start_date,
@@ -183,7 +184,9 @@ class ImportItem(models.Model):
         return []
 
     def __repr__(self):
+        # pylint: disable=consider-using-f-string
         return "<{!r}Item {!r}>".format(self.data["import_source"], self.data["Title"])
 
     def __str__(self):
+        # pylint: disable=consider-using-f-string
         return "{} by {}".format(self.data["Title"], self.data["Author"])
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index bbad5ba9b..022a0d981 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -42,7 +42,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
 
     def get_remote_id(self):
         """don't want the user to be in there in this case"""
-        return "https://%s/list/%d" % (DOMAIN, self.id)
+        return f"https://{DOMAIN}/list/{self.id}"
 
     @property
     def collection_queryset(self):
@@ -92,6 +92,12 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
                 notification_type="ADD",
             )
 
+    def raise_not_deletable(self, viewer):
+        """the associated user OR the list owner can delete"""
+        if self.book_list.user == viewer:
+            return
+        super().raise_not_deletable(viewer)
+
     class Meta:
         """A book may only be placed into a list once,
         and each order in the list may be used only once"""
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index ff0b4e5a6..a4968f61f 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -1,6 +1,8 @@
 """ alert a user to activity """
 from django.db import models
+from django.dispatch import receiver
 from .base_model import BookWyrmModel
+from . import Boost, Favorite, ImportJob, Report, Status, User
 
 
 NotificationType = models.TextChoices(
@@ -53,3 +55,127 @@ class Notification(BookWyrmModel):
                 name="notification_type_valid",
             )
         ]
+
+
+@receiver(models.signals.post_save, sender=Favorite)
+# pylint: disable=unused-argument
+def notify_on_fav(sender, instance, *args, **kwargs):
+    """someone liked your content, you ARE loved"""
+    if not instance.status.user.local or instance.status.user == instance.user:
+        return
+    Notification.objects.create(
+        user=instance.status.user,
+        notification_type="FAVORITE",
+        related_user=instance.user,
+        related_status=instance.status,
+    )
+
+
+@receiver(models.signals.post_delete, sender=Favorite)
+# pylint: disable=unused-argument
+def notify_on_unfav(sender, instance, *args, **kwargs):
+    """oops, didn't like that after all"""
+    if not instance.status.user.local:
+        return
+    Notification.objects.filter(
+        user=instance.status.user,
+        related_user=instance.user,
+        related_status=instance.status,
+        notification_type="FAVORITE",
+    ).delete()
+
+
+@receiver(models.signals.post_save)
+# pylint: disable=unused-argument
+def notify_user_on_mention(sender, instance, *args, **kwargs):
+    """creating and deleting statuses with @ mentions and replies"""
+    if not issubclass(sender, Status):
+        return
+
+    if instance.deleted:
+        Notification.objects.filter(related_status=instance).delete()
+        return
+
+    if (
+        instance.reply_parent
+        and instance.reply_parent.user != instance.user
+        and instance.reply_parent.user.local
+    ):
+        Notification.objects.create(
+            user=instance.reply_parent.user,
+            notification_type="REPLY",
+            related_user=instance.user,
+            related_status=instance,
+        )
+    for mention_user in instance.mention_users.all():
+        # avoid double-notifying about this status
+        if not mention_user.local or (
+            instance.reply_parent and mention_user == instance.reply_parent.user
+        ):
+            continue
+        Notification.objects.create(
+            user=mention_user,
+            notification_type="MENTION",
+            related_user=instance.user,
+            related_status=instance,
+        )
+
+
+@receiver(models.signals.post_save, sender=Boost)
+# pylint: disable=unused-argument
+def notify_user_on_boost(sender, instance, *args, **kwargs):
+    """boosting a status"""
+    if (
+        not instance.boosted_status.user.local
+        or instance.boosted_status.user == instance.user
+    ):
+        return
+
+    Notification.objects.create(
+        user=instance.boosted_status.user,
+        related_status=instance.boosted_status,
+        related_user=instance.user,
+        notification_type="BOOST",
+    )
+
+
+@receiver(models.signals.post_delete, sender=Boost)
+# pylint: disable=unused-argument
+def notify_user_on_unboost(sender, instance, *args, **kwargs):
+    """unboosting a status"""
+    Notification.objects.filter(
+        user=instance.boosted_status.user,
+        related_status=instance.boosted_status,
+        related_user=instance.user,
+        notification_type="BOOST",
+    ).delete()
+
+
+@receiver(models.signals.post_save, sender=ImportJob)
+# pylint: disable=unused-argument
+def notify_user_on_import_complete(sender, instance, *args, **kwargs):
+    """we imported your books! aren't you proud of us"""
+    if not instance.complete:
+        return
+    Notification.objects.create(
+        user=instance.user,
+        notification_type="IMPORT",
+        related_import=instance,
+    )
+
+
+@receiver(models.signals.post_save, sender=Report)
+# pylint: disable=unused-argument
+def notify_admins_on_report(sender, instance, *args, **kwargs):
+    """something is up, make sure the admins know"""
+    # moderators and superusers should be notified
+    admins = User.objects.filter(
+        models.Q(user_permissions__name__in=["moderate_user", "moderate_post"])
+        | models.Q(is_superuser=True)
+    ).all()
+    for admin in admins:
+        Notification.objects.create(
+            user=admin,
+            related_report=instance,
+            notification_type="REPORT",
+        )
diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index df341c8b2..f75918ac1 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -1,7 +1,7 @@
 """ progress in a book """
-from django.db import models
-from django.utils import timezone
 from django.core import validators
+from django.db import models
+from django.db.models import F, Q
 
 from .base_model import BookWyrmModel
 
@@ -26,11 +26,14 @@ class ReadThrough(BookWyrmModel):
     )
     start_date = models.DateTimeField(blank=True, null=True)
     finish_date = models.DateTimeField(blank=True, null=True)
+    is_active = models.BooleanField(default=True)
 
     def save(self, *args, **kwargs):
         """update user active time"""
-        self.user.last_active_date = timezone.now()
-        self.user.save(broadcast=False, update_fields=["last_active_date"])
+        self.user.update_active_date()
+        # an active readthrough must have an unset finish date
+        if self.finish_date:
+            self.is_active = False
         super().save(*args, **kwargs)
 
     def create_update(self):
@@ -41,6 +44,16 @@ class ReadThrough(BookWyrmModel):
             )
         return None
 
+    class Meta:
+        """Don't let readthroughs end before they start"""
+
+        constraints = [
+            models.CheckConstraint(
+                check=Q(finish_date__gte=F("start_date")), name="chronology"
+            )
+        ]
+        ordering = ("-start_date",)
+
 
 class ProgressUpdate(BookWyrmModel):
     """Store progress through a book in the database."""
@@ -54,6 +67,5 @@ class ProgressUpdate(BookWyrmModel):
 
     def save(self, *args, **kwargs):
         """update user active time"""
-        self.user.last_active_date = timezone.now()
-        self.user.save(broadcast=False, update_fields=["last_active_date"])
+        self.user.update_active_date()
         super().save(*args, **kwargs)
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index edb89d13c..fc7a9df83 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -53,7 +53,7 @@ class UserRelationship(BookWyrmModel):
     def get_remote_id(self):
         """use shelf identifier in remote_id"""
         base_path = self.user_subject.remote_id
-        return "%s#follows/%d" % (base_path, self.id)
+        return f"{base_path}#follows/{self.id}"
 
 
 class UserFollows(ActivityMixin, UserRelationship):
@@ -144,7 +144,8 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
         """get id for sending an accept or reject of a local user"""
 
         base_path = self.user_object.remote_id
-        return "%s#%s/%d" % (base_path, status, self.id or 0)
+        status_id = self.id or 0
+        return f"{base_path}#{status}/{status_id}"
 
     def accept(self, broadcast_only=False):
         """turn this request into the real deal"""
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 7ff4c9091..636817cb2 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -1,5 +1,4 @@
 """ flagged for moderation """
-from django.apps import apps
 from django.db import models
 from django.db.models import F, Q
 from .base_model import BookWyrmModel
@@ -16,23 +15,6 @@ class Report(BookWyrmModel):
     statuses = models.ManyToManyField("Status", blank=True)
     resolved = models.BooleanField(default=False)
 
-    def save(self, *args, **kwargs):
-        """notify admins when a report is created"""
-        super().save(*args, **kwargs)
-        user_model = apps.get_model("bookwyrm.User", require_ready=True)
-        # moderators and superusers should be notified
-        admins = user_model.objects.filter(
-            Q(user_permissions__name__in=["moderate_user", "moderate_post"])
-            | Q(is_superuser=True)
-        ).all()
-        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        for admin in admins:
-            notification_model.objects.create(
-                user=admin,
-                related_report=self,
-                notification_type="REPORT",
-            )
-
     class Meta:
         """don't let users report themselves"""
 
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index c4e907d27..89ea9471d 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -1,5 +1,6 @@
 """ puttin' books on shelves """
 import re
+from django.core.exceptions import PermissionDenied
 from django.db import models
 from django.utils import timezone
 
@@ -44,7 +45,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     def get_identifier(self):
         """custom-shelf-123 for the url"""
         slug = re.sub(r"[^\w]", "", self.name).lower()
-        return "{:s}-{:d}".format(slug, self.id)
+        return f"{slug}-{self.id}"
 
     @property
     def collection_queryset(self):
@@ -55,7 +56,13 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
         """shelf identifier instead of id"""
         base_path = self.user.remote_id
         identifier = self.identifier or self.get_identifier()
-        return "%s/books/%s" % (base_path, identifier)
+        return f"{base_path}/books/{identifier}"
+
+    def raise_not_deletable(self, viewer):
+        """don't let anyone delete a default shelf"""
+        super().raise_not_deletable(viewer)
+        if not self.editable:
+            raise PermissionDenied()
 
     class Meta:
         """user/shelf unqiueness"""
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index ef3f7c3ca..8338fff88 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -20,10 +20,17 @@ class SiteSettings(models.Model):
         max_length=150, default="Social Reading and Reviewing"
     )
     instance_description = models.TextField(default="This instance has no description.")
+    instance_short_description = models.CharField(max_length=255, blank=True, null=True)
 
     # about page
     registration_closed_text = models.TextField(
-        default="Contact an administrator to get an invite"
+        default="We aren't taking new users at this time. You can find an open "
+        'instance at <a href="https://joinbookwyrm.com/instances">'
+        "joinbookwyrm.com/instances</a>."
+    )
+    invite_request_text = models.TextField(
+        default="If your request is approved, you will receive an email with a "
+        "registration link."
     )
     code_of_conduct = models.TextField(default="Add a code of conduct here.")
     privacy_policy = models.TextField(default="Add a privacy policy here.")
@@ -80,7 +87,7 @@ class SiteInvite(models.Model):
     @property
     def link(self):
         """formats the invite link"""
-        return "https://{}/invite/{}".format(DOMAIN, self.code)
+        return f"https://{DOMAIN}/invite/{self.code}"
 
 
 class InviteRequest(BookWyrmModel):
@@ -120,7 +127,7 @@ class PasswordReset(models.Model):
     @property
     def link(self):
         """formats the invite link"""
-        return "https://{}/password-reset/{}".format(DOMAIN, self.code)
+        return f"https://{DOMAIN}/password-reset/{self.code}"
 
 
 # pylint: disable=unused-argument
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 9274a5813..b62036788 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -3,6 +3,7 @@ from dataclasses import MISSING
 import re
 
 from django.apps import apps
+from django.core.exceptions import PermissionDenied
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.dispatch import receiver
@@ -67,40 +68,6 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
         ordering = ("-published_date",)
 
-    def save(self, *args, **kwargs):
-        """save and notify"""
-        super().save(*args, **kwargs)
-
-        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
-
-        if self.deleted:
-            notification_model.objects.filter(related_status=self).delete()
-            return
-
-        if (
-            self.reply_parent
-            and self.reply_parent.user != self.user
-            and self.reply_parent.user.local
-        ):
-            notification_model.objects.create(
-                user=self.reply_parent.user,
-                notification_type="REPLY",
-                related_user=self.user,
-                related_status=self,
-            )
-        for mention_user in self.mention_users.all():
-            # avoid double-notifying about this status
-            if not mention_user.local or (
-                self.reply_parent and mention_user == self.reply_parent.user
-            ):
-                continue
-            notification_model.objects.create(
-                user=mention_user,
-                notification_type="MENTION",
-                related_user=self.user,
-                related_status=self,
-            )
-
     def delete(self, *args, **kwargs):  # pylint: disable=unused-argument
         """ "delete" a status"""
         if hasattr(self, "boosted_status"):
@@ -108,6 +75,10 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
             super().delete(*args, **kwargs)
             return
         self.deleted = True
+        # clear user content
+        self.content = None
+        if hasattr(self, "quotation"):
+            self.quotation = None  # pylint: disable=attribute-defined-outside-init
         self.deleted_date = timezone.now()
         self.save()
 
@@ -179,9 +150,9 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         """helper function for loading AP serialized replies to a status"""
         return self.to_ordered_collection(
             self.replies(self),
-            remote_id="%s/replies" % self.remote_id,
+            remote_id=f"{self.remote_id}/replies",
             collection_only=True,
-            **kwargs
+            **kwargs,
         ).serialize()
 
     def to_activity_dataclass(self, pure=False):  # pylint: disable=arguments-differ
@@ -217,6 +188,13 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         """json serialized activitypub class"""
         return self.to_activity_dataclass(pure=pure).serialize()
 
+    def raise_not_editable(self, viewer):
+        """certain types of status aren't editable"""
+        # first, the standard raise
+        super().raise_not_editable(viewer)
+        if isinstance(self, (GeneratedNote, ReviewRating)):
+            raise PermissionDenied()
+
 
 class GeneratedNote(Status):
     """these are app-generated messages about user activity"""
@@ -226,10 +204,10 @@ class GeneratedNote(Status):
         """indicate the book in question for mastodon (or w/e) users"""
         message = self.content
         books = ", ".join(
-            '<a href="%s">"%s"</a>' % (book.remote_id, book.title)
+            f'<a href="{book.remote_id}">"{book.title}"</a>'
             for book in self.mention_books.all()
         )
-        return "%s %s %s" % (self.user.display_name, message, books)
+        return f"{self.user.display_name} {message} {books}"
 
     activity_serializer = activitypub.GeneratedNote
     pure_type = "Note"
@@ -277,10 +255,9 @@ class Comment(BookStatus):
     @property
     def pure_content(self):
         """indicate the book in question for mastodon (or w/e) users"""
-        return '%s<p>(comment on <a href="%s">"%s"</a>)</p>' % (
-            self.content,
-            self.book.remote_id,
-            self.book.title,
+        return (
+            f'{self.content}<p>(comment on <a href="{self.book.remote_id}">'
+            f'"{self.book.title}"</a>)</p>'
         )
 
     activity_serializer = activitypub.Comment
@@ -290,17 +267,25 @@ class Quotation(BookStatus):
     """like a review but without a rating and transient"""
 
     quote = fields.HtmlField()
+    position = models.IntegerField(
+        validators=[MinValueValidator(0)], null=True, blank=True
+    )
+    position_mode = models.CharField(
+        max_length=3,
+        choices=ProgressMode.choices,
+        default=ProgressMode.PAGE,
+        null=True,
+        blank=True,
+    )
 
     @property
     def pure_content(self):
         """indicate the book in question for mastodon (or w/e) users"""
         quote = re.sub(r"^<p>", '<p>"', self.quote)
         quote = re.sub(r"</p>$", '"</p>', quote)
-        return '%s <p>-- <a href="%s">"%s"</a></p>%s' % (
-            quote,
-            self.book.remote_id,
-            self.book.title,
-            self.content,
+        return (
+            f'{quote} <p>-- <a href="{self.book.remote_id}">'
+            f'"{self.book.title}"</a></p>{self.content}'
         )
 
     activity_serializer = activitypub.Quotation
@@ -379,27 +364,6 @@ class Boost(ActivityMixin, Status):
             return
 
         super().save(*args, **kwargs)
-        if not self.boosted_status.user.local or self.boosted_status.user == self.user:
-            return
-
-        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        notification_model.objects.create(
-            user=self.boosted_status.user,
-            related_status=self.boosted_status,
-            related_user=self.user,
-            notification_type="BOOST",
-        )
-
-    def delete(self, *args, **kwargs):
-        """delete and un-notify"""
-        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
-        notification_model.objects.filter(
-            user=self.boosted_status.user,
-            related_status=self.boosted_status,
-            related_user=self.user,
-            notification_type="BOOST",
-        ).delete()
-        super().delete(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         """the user field is "actor" here instead of "attributedTo" """
@@ -412,10 +376,6 @@ class Boost(ActivityMixin, Status):
         self.image_fields = []
         self.deserialize_reverse_fields = []
 
-    # This constraint can't work as it would cross tables.
-    # class Meta:
-    #     unique_together = ('user', 'boosted_status')
-
 
 # pylint: disable=unused-argument
 @receiver(models.signals.post_save)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 0ef23d3f0..637baa6ee 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -82,9 +82,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     preview_image = models.ImageField(
         upload_to="previews/avatars/", blank=True, null=True
     )
-    followers = fields.ManyToManyField(
+    followers_url = fields.CharField(max_length=255, activitypub_field="followers")
+    followers = models.ManyToManyField(
         "self",
-        link_only=True,
         symmetrical=False,
         through="UserFollows",
         through_fields=("user_object", "user_subject"),
@@ -105,7 +105,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         related_name="blocked_by",
     )
     saved_lists = models.ManyToManyField(
-        "List", symmetrical=False, related_name="saved_lists"
+        "List", symmetrical=False, related_name="saved_lists", blank=True
     )
     favorites = models.ManyToManyField(
         "Status",
@@ -122,16 +122,21 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     updated_date = models.DateTimeField(auto_now=True)
     last_active_date = models.DateTimeField(default=timezone.now)
     manually_approves_followers = fields.BooleanField(default=False)
+
+    # options to turn features on and off
     show_goal = models.BooleanField(default=True)
+    show_suggested_users = models.BooleanField(default=True)
     discoverable = fields.BooleanField(default=False)
+
     preferred_timezone = models.CharField(
         choices=[(str(tz), str(tz)) for tz in pytz.all_timezones],
         default=str(pytz.utc),
         max_length=255,
     )
     deactivation_reason = models.CharField(
-        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+        max_length=255, choices=DeactivationReason, null=True, blank=True
     )
+    deactivation_date = models.DateTimeField(null=True, blank=True)
     confirmation_code = models.CharField(max_length=32, default=new_access_code)
 
     name_field = "username"
@@ -147,12 +152,13 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     @property
     def following_link(self):
         """just how to find out the following info"""
-        return "{:s}/following".format(self.remote_id)
+        return f"{self.remote_id}/following"
 
     @property
     def alt_text(self):
         """alt text with username"""
-        return "avatar for %s" % (self.localname or self.username)
+        # pylint: disable=consider-using-f-string
+        return "avatar for {:s}".format(self.localname or self.username)
 
     @property
     def display_name(self):
@@ -189,12 +195,15 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             queryset = queryset.exclude(blocks=viewer)
         return queryset
 
+    def update_active_date(self):
+        """this user is here! they are doing things!"""
+        self.last_active_date = timezone.now()
+        self.save(broadcast=False, update_fields=["last_active_date"])
+
     def to_outbox(self, filter_type=None, **kwargs):
         """an ordered collection of statuses"""
         if filter_type:
-            filter_class = apps.get_model(
-                "bookwyrm.%s" % filter_type, require_ready=True
-            )
+            filter_class = apps.get_model(f"bookwyrm.{filter_type}", require_ready=True)
             if not issubclass(filter_class, Status):
                 raise TypeError(
                     "filter_status_class must be a subclass of models.Status"
@@ -218,7 +227,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def to_following_activity(self, **kwargs):
         """activitypub following list"""
-        remote_id = "%s/following" % self.remote_id
+        remote_id = f"{self.remote_id}/following"
         return self.to_ordered_collection(
             self.following.order_by("-updated_date").all(),
             remote_id=remote_id,
@@ -228,7 +237,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def to_followers_activity(self, **kwargs):
         """activitypub followers list"""
-        remote_id = "%s/followers" % self.remote_id
+        remote_id = self.followers_url
         return self.to_ordered_collection(
             self.followers.order_by("-updated_date").all(),
             remote_id=remote_id,
@@ -261,10 +270,15 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         if not self.local and not re.match(regex.FULL_USERNAME, self.username):
             # generate a username that uses the domain (webfinger format)
             actor_parts = urlparse(self.remote_id)
-            self.username = "%s@%s" % (self.username, actor_parts.netloc)
+            self.username = f"{self.username}@{actor_parts.netloc}"
 
         # this user already exists, no need to populate fields
         if not created:
+            if self.is_active:
+                self.deactivation_date = None
+            elif not self.deactivation_date:
+                self.deactivation_date = timezone.now()
+
             super().save(*args, **kwargs)
             return
 
@@ -274,28 +288,47 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             transaction.on_commit(lambda: set_remote_server.delay(self.id))
             return
 
-        # populate fields for local users
-        self.remote_id = "%s/user/%s" % (site_link(), self.localname)
-        self.inbox = "%s/inbox" % self.remote_id
-        self.shared_inbox = "%s/inbox" % site_link()
-        self.outbox = "%s/outbox" % self.remote_id
+        with transaction.atomic():
+            # populate fields for local users
+            link = site_link()
+            self.remote_id = f"{link}/user/{self.localname}"
+            self.followers_url = f"{self.remote_id}/followers"
+            self.inbox = f"{self.remote_id}/inbox"
+            self.shared_inbox = f"{link}/inbox"
+            self.outbox = f"{self.remote_id}/outbox"
 
-        # an id needs to be set before we can proceed with related models
+            # an id needs to be set before we can proceed with related models
+            super().save(*args, **kwargs)
+
+            # make users editors by default
+            try:
+                self.groups.add(Group.objects.get(name="editor"))
+            except Group.DoesNotExist:
+                # this should only happen in tests
+                pass
+
+            # create keys and shelves for new local users
+            self.key_pair = KeyPair.objects.create(
+                remote_id=f"{self.remote_id}/#main-key"
+            )
+            self.save(broadcast=False, update_fields=["key_pair"])
+
+            self.create_shelves()
+
+    def delete(self, *args, **kwargs):
+        """deactivate rather than delete a user"""
+        self.is_active = False
+        # skip the logic in this class's save()
         super().save(*args, **kwargs)
 
-        # make users editors by default
-        try:
-            self.groups.add(Group.objects.get(name="editor"))
-        except Group.DoesNotExist:
-            # this should only happen in tests
-            pass
-
-        # create keys and shelves for new local users
-        self.key_pair = KeyPair.objects.create(
-            remote_id="%s/#main-key" % self.remote_id
-        )
-        self.save(broadcast=False, update_fields=["key_pair"])
+    @property
+    def local_path(self):
+        """this model doesn't inherit bookwyrm model, so here we are"""
+        # pylint: disable=consider-using-f-string
+        return "/user/{:s}".format(self.localname or self.username)
 
+    def create_shelves(self):
+        """default shelves for a new user"""
         shelves = [
             {
                 "name": "To Read",
@@ -319,17 +352,6 @@ class User(OrderedCollectionPageMixin, AbstractUser):
                 editable=False,
             ).save(broadcast=False)
 
-    def delete(self, *args, **kwargs):
-        """deactivate rather than delete a user"""
-        self.is_active = False
-        # skip the logic in this class's save()
-        super().save(*args, **kwargs)
-
-    @property
-    def local_path(self):
-        """this model doesn't inherit bookwyrm model, so here we are"""
-        return "/user/%s" % (self.localname or self.username)
-
 
 class KeyPair(ActivitypubMixin, BookWyrmModel):
     """public and private keys for a user"""
@@ -344,7 +366,7 @@ class KeyPair(ActivitypubMixin, BookWyrmModel):
 
     def get_remote_id(self):
         # self.owner is set by the OneToOneField on User
-        return "%s/#main-key" % self.owner.remote_id
+        return f"{self.owner.remote_id}/#main-key"
 
     def save(self, *args, **kwargs):
         """create a key pair"""
@@ -381,7 +403,7 @@ class AnnualGoal(BookWyrmModel):
 
     def get_remote_id(self):
         """put the year in the path"""
-        return "{:s}/goal/{:d}".format(self.user.remote_id, self.year)
+        return f"{self.user.remote_id}/goal/{self.year}"
 
     @property
     def books(self):
@@ -418,7 +440,7 @@ class AnnualGoal(BookWyrmModel):
         }
 
 
-@app.task
+@app.task(queue="low_priority")
 def set_remote_server(user_id):
     """figure out the user's remote server in the background"""
     user = User.objects.get(id=user_id)
@@ -437,7 +459,7 @@ def get_or_create_remote_server(domain):
         pass
 
     try:
-        data = get_data("https://%s/.well-known/nodeinfo" % domain)
+        data = get_data(f"https://{domain}/.well-known/nodeinfo")
         try:
             nodeinfo_url = data.get("links")[0].get("href")
         except (TypeError, KeyError):
@@ -457,7 +479,7 @@ def get_or_create_remote_server(domain):
     return server
 
 
-@app.task
+@app.task(queue="low_priority")
 def get_remote_reviews(outbox):
     """ingest reviews by a new remote bookwyrm user"""
     outbox_page = outbox + "?page=true&type=Review"
diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py
index 4f85bb56e..8224a2787 100644
--- a/bookwyrm/preview_images.py
+++ b/bookwyrm/preview_images.py
@@ -220,6 +220,7 @@ def generate_default_inner_img():
 
 
 # pylint: disable=too-many-locals
+# pylint: disable=too-many-statements
 def generate_preview_image(
     texts=None, picture=None, rating=None, show_instance_layer=True
 ):
@@ -237,7 +238,8 @@ def generate_preview_image(
 
     # Color
     if BG_COLOR in ["use_dominant_color_light", "use_dominant_color_dark"]:
-        image_bg_color = "rgb(%s, %s, %s)" % dominant_color
+        red, green, blue = dominant_color
+        image_bg_color = f"rgb({red}, {green}, {blue})"
 
         # Adjust color
         image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)]
@@ -315,7 +317,8 @@ def save_and_cleanup(image, instance=None):
     """Save and close the file"""
     if not isinstance(instance, (models.Book, models.User, models.SiteSettings)):
         return False
-    file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4()))
+    uuid = uuid4()
+    file_name = f"{instance.id}-{uuid}.jpg"
     image_buffer = BytesIO()
 
     try:
@@ -352,7 +355,7 @@ def save_and_cleanup(image, instance=None):
 
 
 # pylint: disable=invalid-name
-@app.task
+@app.task(queue="low_priority")
 def generate_site_preview_image_task():
     """generate preview_image for the website"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -377,7 +380,7 @@ def generate_site_preview_image_task():
 
 
 # pylint: disable=invalid-name
-@app.task
+@app.task(queue="low_priority")
 def generate_edition_preview_image_task(book_id):
     """generate preview_image for a book"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -402,7 +405,7 @@ def generate_edition_preview_image_task(book_id):
     save_and_cleanup(image, instance=book)
 
 
-@app.task
+@app.task(queue="low_priority")
 def generate_user_preview_image_task(user_id):
     """generate preview_image for a book"""
     if not settings.ENABLE_PREVIEW_IMAGES:
@@ -412,7 +415,7 @@ def generate_user_preview_image_task(user_id):
 
     texts = {
         "text_one": user.display_name,
-        "text_three": "@{}@{}".format(user.localname, settings.DOMAIN),
+        "text_three": f"@{user.localname}@{settings.DOMAIN}",
     }
 
     if user.avatar:
diff --git a/bookwyrm/sanitize_html.py b/bookwyrm/sanitize_html.py
index 0be64c58c..8b0e3c4cb 100644
--- a/bookwyrm/sanitize_html.py
+++ b/bookwyrm/sanitize_html.py
@@ -48,7 +48,7 @@ class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
             return
 
         self.tag_stack = self.tag_stack[:-1]
-        self.output.append(("tag", "</%s>" % tag))
+        self.output.append(("tag", f"</{tag}>"))
 
     def handle_data(self, data):
         """extract the answer, if we're in an answer tag"""
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index c1f900794..31c2edf80 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -13,16 +13,7 @@ VERSION = "0.0.1"
 PAGE_LENGTH = env("PAGE_LENGTH", 15)
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
-# celery
-CELERY_BROKER = "redis://:{}@redis_broker:{}/0".format(
-    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
-)
-CELERY_RESULT_BACKEND = "redis://:{}@redis_broker:{}/0".format(
-    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
-)
-CELERY_ACCEPT_CONTENT = ["application/json"]
-CELERY_TASK_SERIALIZER = "json"
-CELERY_RESULT_SERIALIZER = "json"
+JS_CACHE = "7f2343cf"
 
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
@@ -32,7 +23,7 @@ EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
 EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
-DEFAULT_FROM_EMAIL = "admin@{:s}".format(env("DOMAIN"))
+DEFAULT_FROM_EMAIL = f"admin@{DOMAIN}"
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -86,7 +77,8 @@ MIDDLEWARE = [
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "bookwyrm.timezone_middleware.TimezoneMiddleware",
+    "bookwyrm.middleware.TimezoneMiddleware",
+    "bookwyrm.middleware.IPBlocklistMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
@@ -135,7 +127,7 @@ DATABASES = {
         "USER": env("POSTGRES_USER", "fedireads"),
         "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"),
         "HOST": env("POSTGRES_HOST", ""),
-        "PORT": env("POSTGRES_PORT", 5432),
+        "PORT": env("PGPORT", 5432),
     },
 }
 
@@ -186,11 +178,8 @@ USE_L10N = True
 USE_TZ = True
 
 
-USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
-    requests.utils.default_user_agent(),
-    VERSION,
-    DOMAIN,
-)
+agent = requests.utils.default_user_agent()
+USER_AGENT = f"{agent} (BookWyrm/{VERSION}; +https://{DOMAIN}/)"
 
 # Imagekit generated thumbnails
 ENABLE_THUMBNAIL_GENERATION = env.bool("ENABLE_THUMBNAIL_GENERATION", False)
@@ -221,11 +210,11 @@ if USE_S3:
     AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}
     # S3 Static settings
     STATIC_LOCATION = "static"
-    STATIC_URL = "https://%s/%s/" % (AWS_S3_CUSTOM_DOMAIN, STATIC_LOCATION)
+    STATIC_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/"
     STATICFILES_STORAGE = "bookwyrm.storage_backends.StaticStorage"
     # S3 Media settings
     MEDIA_LOCATION = "images"
-    MEDIA_URL = "https://%s/%s/" % (AWS_S3_CUSTOM_DOMAIN, MEDIA_LOCATION)
+    MEDIA_URL = f"https://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/"
     MEDIA_FULL_URL = MEDIA_URL
     DEFAULT_FILE_STORAGE = "bookwyrm.storage_backends.ImagesStorage"
     # I don't know if it's used, but the site crashes without it
@@ -235,5 +224,5 @@ else:
     STATIC_URL = "/static/"
     STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
     MEDIA_URL = "/images/"
-    MEDIA_FULL_URL = "%s://%s%s" % (PROTOCOL, DOMAIN, MEDIA_URL)
+    MEDIA_FULL_URL = f"{PROTOCOL}://{DOMAIN}{MEDIA_URL}"
     MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))
diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py
index c8c900283..61cafe71f 100644
--- a/bookwyrm/signatures.py
+++ b/bookwyrm/signatures.py
@@ -26,21 +26,21 @@ def make_signature(sender, destination, date, digest):
     """uses a private key to sign an outgoing message"""
     inbox_parts = urlparse(destination)
     signature_headers = [
-        "(request-target): post %s" % inbox_parts.path,
-        "host: %s" % inbox_parts.netloc,
-        "date: %s" % date,
-        "digest: %s" % digest,
+        f"(request-target): post {inbox_parts.path}",
+        f"host: {inbox_parts.netloc}",
+        f"date: {date}",
+        f"digest: {digest}",
     ]
     message_to_sign = "\n".join(signature_headers)
     signer = pkcs1_15.new(RSA.import_key(sender.key_pair.private_key))
     signed_message = signer.sign(SHA256.new(message_to_sign.encode("utf8")))
     signature = {
-        "keyId": "%s#main-key" % sender.remote_id,
+        "keyId": f"{sender.remote_id}#main-key",
         "algorithm": "rsa-sha256",
         "headers": "(request-target) host date digest",
         "signature": b64encode(signed_message).decode("utf8"),
     }
-    return ",".join('%s="%s"' % (k, v) for (k, v) in signature.items())
+    return ",".join(f'{k}="{v}"' for (k, v) in signature.items())
 
 
 def make_digest(data):
@@ -58,7 +58,7 @@ def verify_digest(request):
     elif algorithm == "SHA-512":
         hash_function = hashlib.sha512
     else:
-        raise ValueError("Unsupported hash function: {}".format(algorithm))
+        raise ValueError(f"Unsupported hash function: {algorithm}")
 
     expected = hash_function(request.body).digest()
     if b64decode(digest) != expected:
@@ -95,18 +95,18 @@ class Signature:
     def verify(self, public_key, request):
         """verify rsa signature"""
         if http_date_age(request.headers["date"]) > MAX_SIGNATURE_AGE:
-            raise ValueError("Request too old: %s" % (request.headers["date"],))
+            raise ValueError(f"Request too old: {request.headers['date']}")
         public_key = RSA.import_key(public_key)
 
         comparison_string = []
         for signed_header_name in self.headers.split(" "):
             if signed_header_name == "(request-target)":
-                comparison_string.append("(request-target): post %s" % request.path)
+                comparison_string.append(f"(request-target): post {request.path}")
             else:
                 if signed_header_name == "digest":
                     verify_digest(request)
                 comparison_string.append(
-                    "%s: %s" % (signed_header_name, request.headers[signed_header_name])
+                    f"{signed_header_name}: {request.headers[signed_header_name]}"
                 )
         comparison_string = "\n".join(comparison_string)
 
diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 0724c7f14..e1012c2fd 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -89,6 +89,32 @@ body {
     display: inline !important;
 }
 
+input[type=file]::file-selector-button {
+    -moz-appearance: none;
+    -webkit-appearance: none;
+    background-color: #fff;
+    border-radius: 4px;
+    border: 1px solid #dbdbdb;
+    box-shadow: none;
+    color: #363636;
+    cursor: pointer;
+    font-size: 1rem;
+    height: 2.5em;
+    justify-content: center;
+    line-height: 1.5;
+    padding-bottom: calc(0.5em - 1px);
+    padding-left: 1em;
+    padding-right: 1em;
+    padding-top: calc(0.5em - 1px);
+    text-align: center;
+    white-space: nowrap;
+}
+
+input[type=file]::file-selector-button:hover {
+    border-color: #b5b5b5;
+    color: #363636;
+}
+
 /** Shelving
  ******************************************************************************/
 
@@ -96,7 +122,7 @@ body {
     @see https://www.youtube.com/watch?v=9xXBYcWgCHA */
 .shelf-option:disabled > *::after {
     font-family: "icomoon"; /* stylelint-disable font-family-no-missing-generic-family-keyword */
-    content: "\e918";
+    content: "\e919"; /* icon-check */
     margin-left: 0.5em;
 }
 
@@ -167,21 +193,36 @@ body {
 
 /* All stars are visually filled by default. */
 .form-rate-stars .icon::before {
-    content: '\e9d9';
+    content: '\e9d9'; /* icon-star-full */
+}
+
+/* Icons directly following half star inputs are marked as half */
+.form-rate-stars input.half:checked ~ .icon::before {
+    content: '\e9d8'; /* icon-star-half */
+}
+
+/* stylelint-disable no-descending-specificity */
+.form-rate-stars input.half:checked + input + .icon:hover::before {
+    content: '\e9d8' !important; /* icon-star-half */
+}
+
+/* Icons directly following half check inputs that follow the checked input are emptied. */
+.form-rate-stars input.half:checked + input + .icon ~ .icon::before {
+    content: '\e9d7'; /* icon-star-empty */
 }
 
 /* Icons directly following inputs that follow the checked input are emptied. */
 .form-rate-stars input:checked ~ input + .icon::before {
-    content: '\e9d7';
+    content: '\e9d7'; /* icon-star-empty */
 }
 
 /* When a label is hovered, repeat the fill-all-then-empty-following pattern. */
 .form-rate-stars:hover .icon.icon::before {
-    content: '\e9d9';
+    content: '\e9d9' !important; /* icon-star-full */
 }
 
 .form-rate-stars .icon:hover ~ .icon::before {
-    content: '\e9d7';
+    content: '\e9d7' !important; /* icon-star-empty */
 }
 
 /** Book covers
@@ -292,17 +333,59 @@ body {
 }
 
 .quote > blockquote::before {
-    content: "\e906";
+    content: "\e907"; /* icon-quote-open */
     top: 0;
     left: 0;
 }
 
 .quote > blockquote::after {
-    content: "\e905";
+    content: "\e906"; /* icon-quote-close */
     right: 0;
 }
 
-/* States
+/** Animations and transitions
+ ******************************************************************************/
+
+@keyframes turning {
+    from { transform: rotateZ(0deg); }
+    to { transform: rotateZ(360deg); }
+}
+
+.is-processing .icon-spinner::before {
+    animation: turning 1.5s infinite linear;
+}
+
+.icon-spinner {
+    display: none;
+}
+
+.is-processing .icon-spinner {
+    display: flex;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .is-processing .icon::before {
+        transition-duration: 0.001ms !important;
+    }
+}
+
+/** Transient notification
+ ******************************************************************************/
+
+#live-messages {
+    position: fixed;
+    bottom: 1em;
+    right: 1em;
+}
+
+/** Tooltips
+ ******************************************************************************/
+
+.tooltip {
+    width: 100%;
+}
+
+/** States
  ******************************************************************************/
 
 /* "disabled" for non-buttons */
diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot
index 2c801b2b6..8eba8692f 100644
Binary files a/bookwyrm/static/css/fonts/icomoon.eot and b/bookwyrm/static/css/fonts/icomoon.eot differ
diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg
index 6327b19e6..82e413294 100644
--- a/bookwyrm/static/css/fonts/icomoon.svg
+++ b/bookwyrm/static/css/fonts/icomoon.svg
@@ -7,38 +7,39 @@
 <font-face units-per-em="1024" ascent="960" descent="-64" />
 <missing-glyph horiz-adv-x="1024" />
 <glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe900;" glyph-name="book" d="M480 132v628c0 0-86.016 72-208 72s-208-64-208-64v-636c0 0 86.016 62.016 208 62.016s208-62.016 208-62.016zM928 132v628c0 0-86.016 72-208 72s-208-64-208-64v-636c0 0 86.016 62.016 208 62.016s208-62.016 208-62.016zM992 704h-32v-608h-384v-32h-160v32h-384v608h-32v-640h384v-32h225.984l-1.984 32h384v640z" />
-<glyph unicode="&#xe901;" glyph-name="envelope" d="M921.6 870.4c56.554 0 102.4-45.846 102.4-102.4v0-614.4c0-56.554-45.846-102.4-102.4-102.4v0h-819.2c-56.554 0-102.4 45.846-102.4 102.4v0 614.4c0 56.32 46.080 102.4 102.4 102.4h819.2zM697.856 404.48l326.144-250.88v102.4l-262.144 199.68 262.144 209.92v102.4l-512-409.6-512 409.6v-102.4l262.144-209.92-262.144-199.68v-102.4l326.144 250.88 185.856-148.48 185.856 148.48z" />
-<glyph unicode="&#xe902;" glyph-name="arrow-right" d="M426 212.667v428l214-214z" />
-<glyph unicode="&#xe903;" glyph-name="bell" d="M521.143-18.286c0 5.143-4 9.143-9.143 9.143-45.143 0-82.286 37.143-82.286 82.286 0 5.143-4 9.143-9.143 9.143s-9.143-4-9.143-9.143c0-55.429 45.143-100.571 100.571-100.571 5.143 0 9.143 4 9.143 9.143zM987.429 146.286c0-40-33.143-73.143-73.143-73.143h-256c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286h-256c-40 0-73.143 33.143-73.143 73.143 84.571 71.429 182.857 199.429 182.857 475.429 0 109.714 90.857 229.714 242.286 252-2.857 6.857-4.571 14.286-4.571 22.286 0 30.286 24.571 54.857 54.857 54.857s54.857-24.571 54.857-54.857c0-8-1.714-15.429-4.571-22.286 151.429-22.286 242.286-142.286 242.286-252 0-276 98.286-404 182.857-475.429z" />
-<glyph unicode="&#xe904;" glyph-name="x" d="M960 179.264l-268.992 268.736 268.992 268.736-179.264 179.264-268.736-268.864-268.864 268.864-179.136-179.264 268.736-268.736-268.736-268.736 179.136-179.264 268.864 268.864 268.736-268.864z" />
-<glyph unicode="&#xe905;" glyph-name="quote-close" horiz-adv-x="951" d="M438.857 768v-402.286c0-161.143-131.429-292.571-292.571-292.571h-36.571c-20 0-36.571 16.571-36.571 36.571v73.143c0 20 16.571 36.571 36.571 36.571h36.571c80.571 0 146.286 65.714 146.286 146.286v18.286c0 30.286-24.571 54.857-54.857 54.857h-128c-60.571 0-109.714 49.143-109.714 109.714v219.429c0 60.571 49.143 109.714 109.714 109.714h219.429c60.571 0 109.714-49.143 109.714-109.714zM950.857 768v-402.286c0-161.143-131.429-292.571-292.571-292.571h-36.571c-20 0-36.571 16.571-36.571 36.571v73.143c0 20 16.571 36.571 36.571 36.571h36.571c80.571 0 146.286 65.714 146.286 146.286v18.286c0 30.286-24.571 54.857-54.857 54.857h-128c-60.571 0-109.714 49.143-109.714 109.714v219.429c0 60.571 49.143 109.714 109.714 109.714h219.429c60.571 0 109.714-49.143 109.714-109.714z" />
-<glyph unicode="&#xe906;" glyph-name="quote-open" horiz-adv-x="951" d="M438.857 402.286v-219.429c0-60.571-49.143-109.714-109.714-109.714h-219.429c-60.571 0-109.714 49.143-109.714 109.714v402.286c0 161.143 131.429 292.571 292.571 292.571h36.571c20 0 36.571-16.571 36.571-36.571v-73.143c0-20-16.571-36.571-36.571-36.571h-36.571c-80.571 0-146.286-65.714-146.286-146.286v-18.286c0-30.286 24.571-54.857 54.857-54.857h128c60.571 0 109.714-49.143 109.714-109.714zM950.857 402.286v-219.429c0-60.571-49.143-109.714-109.714-109.714h-219.429c-60.571 0-109.714 49.143-109.714 109.714v402.286c0 161.143 131.429 292.571 292.571 292.571h36.571c20 0 36.571-16.571 36.571-36.571v-73.143c0-20-16.571-36.571-36.571-36.571h-36.571c-80.571 0-146.286-65.714-146.286-146.286v-18.286c0-30.286 24.571-54.857 54.857-54.857h128c60.571 0 109.714-49.143 109.714-109.714z" />
-<glyph unicode="&#xe907;" glyph-name="image" horiz-adv-x="1097" d="M365.714 621.714c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM950.857 402.286v-256h-804.571v109.714l182.857 182.857 91.429-91.429 292.571 292.571zM1005.714 804.571h-914.286c-9.714 0-18.286-8.571-18.286-18.286v-694.857c0-9.714 8.571-18.286 18.286-18.286h914.286c9.714 0 18.286 8.571 18.286 18.286v694.857c0 9.714-8.571 18.286-18.286 18.286zM1097.143 786.286v-694.857c0-50.286-41.143-91.429-91.429-91.429h-914.286c-50.286 0-91.429 41.143-91.429 91.429v694.857c0 50.286 41.143 91.429 91.429 91.429h914.286c50.286 0 91.429-41.143 91.429-91.429z" />
-<glyph unicode="&#xe908;" glyph-name="pencil" horiz-adv-x="866" d="M207.429 73.143l52 52-134.286 134.286-52-52v-61.143h73.143v-73.143h61.143zM506.286 603.428c0 7.429-5.143 12.571-12.571 12.571-3.429 0-6.857-1.143-9.714-4l-309.714-309.714c-2.857-2.857-4-6.286-4-9.714 0-7.429 5.143-12.571 12.571-12.571 3.429 0 6.857 1.143 9.714 4l309.714 309.714c2.857 2.857 4 6.286 4 9.714zM475.429 713.143l237.714-237.714-475.429-475.429h-237.714v237.714zM865.714 658.286c0-19.429-8-38.286-21.143-51.429l-94.857-94.857-237.714 237.714 94.857 94.286c13.143 13.714 32 21.714 51.429 21.714s38.286-8 52-21.714l134.286-133.714c13.143-13.714 21.143-32.571 21.143-52z" />
-<glyph unicode="&#xe909;" glyph-name="list" d="M219.429 146.286c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM219.429 438.857c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM1024 201.143v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286zM219.429 731.428c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM1024 493.714v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286zM1024 786.286v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286z" />
-<glyph unicode="&#xe90a;" glyph-name="unlock, unlisted" horiz-adv-x="951" d="M950.857 621.714v-146.286c0-20-16.571-36.571-36.571-36.571h-36.571c-20 0-36.571 16.571-36.571 36.571v146.286c0 80.571-65.714 146.286-146.286 146.286s-146.286-65.714-146.286-146.286v-109.714h54.857c30.286 0 54.857-24.571 54.857-54.857v-329.143c0-30.286-24.571-54.857-54.857-54.857h-548.571c-30.286 0-54.857 24.571-54.857 54.857v329.143c0 30.286 24.571 54.857 54.857 54.857h384v109.714c0 141.143 114.857 256 256 256s256-114.857 256-256z" />
-<glyph unicode="&#xe90b;" glyph-name="globe, public" horiz-adv-x="878" d="M438.857 877.714c242.286 0 438.857-196.571 438.857-438.857s-196.571-438.857-438.857-438.857-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857zM595.429 580c-4.571-3.429-7.429-9.714-13.143-10.857 2.857 0.571 5.714 10.857 7.429 13.143 3.429 4 8 6.286 12.571 8.571 9.714 4 19.429 5.143 29.714 6.857 9.714 2.286 21.714 2.286 29.143-6.286-1.714 1.714 12 13.714 13.714 14.286 5.143 2.857 13.714 1.714 17.143 6.857 1.143 1.714 1.143 12.571 1.143 12.571-9.714-1.143-13.143 8-13.714 16 0-0.571-1.143-2.286-3.429-4.571 0.571 8.571-10.286 2.286-14.286 3.429-13.143 3.429-11.429 12.571-15.429 22.286-2.286 5.143-8.571 6.857-10.857 12-2.286 3.429-3.429 10.857-8.571 11.429-3.429 0.571-9.714-12-10.857-11.429-5.143 2.857-7.429-1.143-11.429-3.429-3.429-2.286-6.286-1.143-9.714-2.857 10.286 3.429-4.571 9.143-9.714 8 8 2.286 4 10.857-0.571 14.857h2.857c-1.143 5.143-17.143 9.714-22.286 13.143s-32.571 9.143-38.286 5.714c-6.857-4 1.714-15.429 1.714-21.143 0.571-6.857-6.857-8.571-6.857-14.286 0-9.714 18.286-8 13.714-21.143-2.857-8-13.714-9.714-18.286-16-4.571-5.714 0.571-16 5.143-20 4.571-3.429-8-9.143-9.714-10.286-9.714-4.571-17.143 9.714-19.429 18.286-1.714 6.286-2.286 13.714-9.143 17.143-3.429 1.143-14.286 2.857-16.571-0.571-3.429 8.571-15.429 12-23.429 14.857-11.429 4-21.143 4-33.143 2.286 4 0.571-1.143 18.286-10.857 15.429 2.857 5.714 1.714 12 2.857 17.714 1.143 4.571 3.429 9.143 6.857 13.143 1.143 2.286 13.714 15.429 9.714 16 9.714-1.143 20.571-1.714 28.571 6.286 5.143 5.143 7.429 13.714 12.571 19.429 7.429 8.571 16.571-2.286 24.571-2.857 11.429-0.571 10.857 12 4.571 17.714 7.429-0.571 1.143 13.143-2.857 14.857-5.143 1.714-24.571-3.429-14.286-7.429-2.286 1.143-16-27.429-24-13.143-2.286 2.857-3.429 14.857-8.571 15.429-4.571 0-7.429-5.143-9.143-8.571 2.857 7.429-16 12.571-20 13.143 8.571 5.714 1.714 12-4.571 15.429-4.571 2.857-18.857 5.143-22.857 0.571-10.857-13.143 11.429-14.857 17.143-18.286 1.714-1.143 8.571-5.143 4.571-8-3.429-1.714-13.714-4.571-14.857-6.857-3.429-5.143 4-10.857-1.143-16-5.143 5.143-5.143 13.714-9.143 19.429 5.143-6.286-20.571-2.857-20-2.857-8.571 0-22.286-5.714-28.571 2.857-1.143 2.286-1.143 15.429 2.286 12.571-5.143 4-8.571 8-12 10.286-18.857-6.286-36.571-14.286-53.714-23.429 2.286-0.571 4-0.571 6.857 0.571 4.571 1.714 8.571 4.571 13.143 6.857 5.714 2.286 17.714 9.143 24 4 0.571 1.143 2.286 2.286 2.857 2.857 4-4.571 8-9.143 11.429-14.286-4.571 2.286-12 1.143-17.143 0.571-4-1.143-10.857-2.286-12.571-6.857 1.714-2.857 4-7.429 2.857-10.286-7.429 5.143-13.143 13.714-23.429 14.857-4.571 0-9.143 0-12.571-0.571-54.857-30.286-101.143-74.286-134.286-126.857 2.286-2.286 4.571-4 6.857-4.571 5.714-1.714 0-18.286 10.857-9.714 3.429-2.857 4-6.857 1.714-10.857 0.571 0.571 23.429-14.286 25.143-15.429 4-3.429 10.286-7.429 12-12 1.143-4-2.286-8.571-5.714-10.286-0.571 1.143-9.143 9.714-10.286 7.429-1.714-2.857 0-18.286 6.286-17.714-9.143-0.571-5.143-36-7.429-42.857 0-0.571 1.143-0.571 1.143-0.571-1.714-6.857 4-33.714 15.429-30.857-7.429-1.714 13.143-28 16-29.714 7.429-5.143 16-8.571 21.143-16 5.714-8 5.714-20 13.714-26.286-2.286-6.857 12-14.857 11.429-24.571-1.143-0.571-1.714-0.571-2.857-1.143 2.857-8 13.714-8 17.714-15.429 2.286-4.571 0-15.429 7.429-13.143 1.143 12.571-7.429 25.143-13.714 35.429-3.429 5.714-6.857 10.857-9.714 16.571-2.857 5.143-3.429 11.429-5.714 17.143 2.286-0.571 14.857-5.143 13.714-6.857-4.571-11.429 18.286-31.429 24.571-38.857 1.714-1.714 14.857-18.857 8-18.857 7.429 0 17.714-11.429 21.143-17.143 5.143-8.571 4-19.429 7.429-28.571 3.429-11.429 19.429-16.571 28.571-21.714 8-4 14.857-9.714 22.857-12.571 12-4.571 14.857-0.571 25.143 1.143 14.857 2.286 16.571-14.286 28.571-20.571 7.429-4 23.429-9.714 31.429-6.286-3.429-1.143 12-24.571 13.143-26.286 5.143-6.857 14.857-10.286 20.571-17.143 1.714 1.143 3.429 2.857 4 5.143-2.286-6.286 8.571-18.286 14.286-17.143 6.286 1.143 8 13.714 8 18.286-11.429-5.714-21.714-1.143-28 10.286-1.143 2.857-10.286 18.857-2.286 18.857 10.857 0 3.429 8.571 2.286 16.571s-9.143 13.143-13.143 20c-3.429-6.857-14.857-5.143-18.286 0.571 0-1.714-1.714-4.571-1.714-6.857-2.857 0-5.714-0.571-8.571 0.571 1.143 6.857 1.714 15.429 3.429 22.857 2.857 10.286 21.714 30.286-2.857 29.143-8.571-0.571-12-4-14.857-11.429-2.857-6.857-1.714-13.143-9.714-16.571-5.143-2.286-22.286-1.143-27.429 1.714-10.857 6.286-18.286 26.286-18.286 37.714-0.571 15.429 7.429 29.143 0 43.429 3.429 2.857 6.857 8.571 10.857 11.429 3.429 2.286 7.429-1.714 9.143 5.143-1.714 1.143-4 3.429-4.571 3.429 8.571-4 24.571 5.714 32 0 4.571-3.429 9.714-4.571 12.571 1.143 0.571 1.714-4 8.571-1.714 13.143 1.714-9.714 8-11.429 16.571-5.143 3.429-3.429 12.571-2.286 18.857-5.714 6.286-4 7.429-10.286 14.857-1.714 4.571-6.857 5.143-6.857 6.857-13.714 1.714-6.286 5.143-22.286 10.857-25.143 12-7.429 9.143 12.571 8 19.429-0.571 0.571-0.571 19.429-1.143 19.429-18.286 4-11.429 18.286-1.143 28 1.714 1.143 14.857 5.714 20.571 10.286 5.143 4.571 11.429 12.571 8.571 20 2.857 0 5.143 2.286 6.286 5.143-1.714 0.571-8.571 6.286-9.714 5.714 4 2.286 3.429 5.714 1.143 9.143 5.714 3.429 2.857 9.714 8.571 12 6.286-8.571 18.857 1.143 12.571 8 5.714 8 18.857 4 22.286 11.429 8.571-2.286 2.286 8.571 6.857 14.857 4 5.143 10.857 5.143 16 8 0-0.571 14.286 8 9.714 8.571 9.714-1.143 29.143 9.143 14.286 17.714 2.286 5.143-5.143 7.429-10.286 8.571 4 1.143 9.143-1.143 12.571 1.143 7.429 5.143 2.286 7.429-4 9.143-8 2.286-18.286-2.857-24.571-6.857zM502.286 78.857c78.286 13.714 148 52.571 200.571 108-3.429 3.429-9.714 2.286-14.286 4.571-4.571 1.714-8 3.429-13.714 4.571 1.143 11.429-11.429 15.429-19.429 21.143-7.429 5.714-12 12-22.857 9.714-1.143-0.571-12.571-4.571-10.286-6.857-7.429 6.286-10.857 9.714-20.571 12.571-9.143 2.857-15.429 14.286-24.571 4-4.571-4.571-2.286-11.429-4.571-16-7.429 6.286 6.857 13.714 1.143 20.571-6.857 8-18.857-5.143-24.571-8.571-3.429-2.857-7.429-4-9.714-7.429-2.857-4-4-9.143-6.286-13.143-1.714 4.571-11.429 3.429-12 6.857 2.286-13.714 2.286-28 5.143-41.714 1.714-8 0-21.143-6.857-27.429s-15.429-13.143-16.571-22.857c-1.143-6.857 0.571-13.143 6.857-14.857 0.571-8.571-9.143-14.857-8.571-24 0-0.571 0.571-6.286 1.143-9.143z" />
-<glyph unicode="&#xe90c;" glyph-name="lock, followers" horiz-adv-x="658" d="M182.857 512h292.571v109.714c0 80.571-65.714 146.286-146.286 146.286s-146.286-65.714-146.286-146.286v-109.714zM658.286 457.143v-329.143c0-30.286-24.571-54.857-54.857-54.857h-548.571c-30.286 0-54.857 24.571-54.857 54.857v329.143c0 30.286 24.571 54.857 54.857 54.857h18.286v109.714c0 140.571 115.429 256 256 256s256-115.429 256-256v-109.714h18.286c30.286 0 54.857-24.571 54.857-54.857z" />
-<glyph unicode="&#xe90d;" glyph-name="chain-broken" horiz-adv-x="951" d="M250.857 224.571l-146.286-146.286c-4-3.429-8.571-5.143-13.143-5.143s-9.143 1.714-13.143 5.143c-6.857 7.429-6.857 18.857 0 26.286l146.286 146.286c7.429 6.857 18.857 6.857 26.286 0 6.857-7.429 6.857-18.857 0-26.286zM347.429 201.143v-182.857c0-10.286-8-18.286-18.286-18.286s-18.286 8-18.286 18.286v182.857c0 10.286 8 18.286 18.286 18.286s18.286-8 18.286-18.286zM219.429 329.143c0-10.286-8-18.286-18.286-18.286h-182.857c-10.286 0-18.286 8-18.286 18.286s8 18.286 18.286 18.286h182.857c10.286 0 18.286-8 18.286-18.286zM941.714 256c0-44-17.143-85.143-48.571-116l-84-83.429c-30.857-30.857-72-47.429-116-47.429s-85.714 17.143-116.571 48.571l-190.857 191.429c-9.714 9.714-17.143 20.571-24 32l136.571 10.286 156-156.571c20.571-20.571 57.143-21.143 77.714-0.571l84 83.429c10.286 10.286 16 24 16 38.286 0 14.857-5.714 28.571-16 38.857l-156.571 157.143 10.286 136.571c11.429-6.857 22.286-14.286 32-24l192-192c30.857-31.429 48-72.571 48-116.571zM589.143 669.714l-136.571-10.286-156 156.571c-10.286 10.286-24 16-38.857 16s-28.571-5.714-38.857-15.429l-84-83.429c-10.286-10.286-16-24-16-38.286 0-14.857 5.714-28.571 16-38.857l156.571-156.571-10.286-137.143c-11.429 6.857-22.286 14.286-32 24l-192 192c-30.857 31.429-48 72.571-48 116.571s17.143 85.143 48.571 116l84 83.429c30.857 30.857 72 47.429 116 47.429s85.714-17.143 116.571-48.571l190.857-191.429c9.714-9.714 17.143-20.571 24-32zM950.857 621.714c0-10.286-8-18.286-18.286-18.286h-182.857c-10.286 0-18.286 8-18.286 18.286s8 18.286 18.286 18.286h182.857c10.286 0 18.286-8 18.286-18.286zM640 932.571v-182.857c0-10.286-8-18.286-18.286-18.286s-18.286 8-18.286 18.286v182.857c0 10.286 8 18.286 18.286 18.286s18.286-8 18.286-18.286zM872.571 846.286l-146.286-146.286c-4-3.429-8.571-5.143-13.143-5.143s-9.143 1.714-13.143 5.143c-6.857 7.429-6.857 18.857 0 26.286l146.286 146.286c7.429 6.857 18.857 6.857 26.286 0 6.857-7.429 6.857-18.857 0-26.286z" />
-<glyph unicode="&#xe90e;" glyph-name="chain" horiz-adv-x="951" d="M832 256c0 14.857-5.714 28.571-16 38.857l-118.857 118.857c-10.286 10.286-24.571 16-38.857 16-16.571 0-29.714-6.286-41.143-18.286 18.857-18.857 41.143-34.857 41.143-64 0-30.286-24.571-54.857-54.857-54.857-29.143 0-45.143 22.286-64 41.143-12-11.429-18.857-24.571-18.857-41.714 0-14.286 5.714-28.571 16-38.857l117.714-118.286c10.286-10.286 24.571-15.429 38.857-15.429s28.571 5.143 38.857 14.857l84 83.429c10.286 10.286 16 24 16 38.286zM430.286 658.857c0 14.286-5.714 28.571-16 38.857l-117.714 118.286c-10.286 10.286-24.571 16-38.857 16s-28.571-5.714-38.857-15.429l-84-83.429c-10.286-10.286-16-24-16-38.286 0-14.857 5.714-28.571 16-38.857l118.857-118.857c10.286-10.286 24.571-15.429 38.857-15.429 16.571 0 29.714 5.714 41.143 17.714-18.857 18.857-41.143 34.857-41.143 64 0 30.286 24.571 54.857 54.857 54.857 29.143 0 45.143-22.286 64-41.143 12 11.429 18.857 24.571 18.857 41.714zM941.714 256c0-43.429-17.714-85.714-48.571-116l-84-83.429c-30.857-30.857-72.571-47.429-116-47.429-44 0-85.714 17.143-116.571 48.571l-117.714 118.286c-30.857 30.857-47.429 72.571-47.429 116 0 45.143 18.286 88 50.286 119.429l-50.286 50.286c-31.429-32-73.714-50.286-118.857-50.286-43.429 0-85.714 17.143-116.571 48l-118.857 118.857c-31.429 31.429-48 72.571-48 116.571 0 43.429 17.714 85.714 48.571 116l84 83.429c30.857 30.857 72.571 47.429 116 47.429 44 0 85.714-17.143 116.571-48.571l117.714-118.286c30.857-30.857 47.429-72.571 47.429-116 0-45.143-18.286-88-50.286-119.429l50.286-50.286c31.429 32 73.714 50.286 118.857 50.286 43.429 0 85.714-17.143 116.571-48l118.857-118.857c31.429-31.429 48-72.571 48-116.571z" />
-<glyph unicode="&#xe90f;" glyph-name="comments" d="M804.571 512c0-161.714-180-292.571-402.286-292.571-34.857 0-68.571 3.429-100.571 9.143-47.429-33.714-101.143-58.286-158.857-73.143-15.429-4-32-6.857-49.143-9.143h-1.714c-8.571 0-16.571 6.857-18.286 16.571v0c-2.286 10.857 5.143 17.714 11.429 25.143 22.286 25.143 47.429 47.429 66.857 94.857-92.571 53.714-152 136.571-152 229.143 0 161.714 180 292.571 402.286 292.571s402.286-130.857 402.286-292.571zM1024 365.714c0-93.143-59.429-175.429-152-229.143 19.429-47.429 44.571-69.714 66.857-94.857 6.286-7.429 13.714-14.286 11.429-25.143v0c-2.286-10.286-10.857-17.714-20-16.571-17.143 2.286-33.714 5.143-49.143 9.143-57.714 14.857-111.429 39.429-158.857 73.143-32-5.714-65.714-9.143-100.571-9.143-103.429 0-198.286 28.571-269.714 75.429 16.571-1.143 33.714-2.286 50.286-2.286 122.857 0 238.857 35.429 327.429 99.429 95.429 69.714 148 164 148 266.286 0 29.714-4.571 58.857-13.143 86.857 96.571-53.143 159.429-137.714 159.429-233.143z" />
-<glyph unicode="&#xe910;" glyph-name="comment" d="M1024 438.857c0-202.286-229.143-365.714-512-365.714-28 0-56 1.714-82.857 4.571-74.857-66.286-164-113.143-262.857-138.286-20.571-5.714-42.857-9.714-65.143-12.571-12.571-1.143-24.571 8-27.429 21.714v0.571c-2.857 14.286 6.857 22.857 15.429 33.143 36 40.571 77.143 74.857 104 170.286-117.714 66.857-193.143 170.286-193.143 286.286 0 201.714 229.143 365.714 512 365.714s512-163.429 512-365.714z" />
-<glyph unicode="&#xe911;" glyph-name="boost" horiz-adv-x="1097" d="M731.429 91.428c0-9.714-8.571-18.286-18.286-18.286h-548.571c-21.143 0-18.286 22.286-18.286 36.571v329.143h-109.714c-20 0-36.571 16.571-36.571 36.571 0 8.571 2.857 17.143 8.571 23.429l182.857 219.429c6.857 8 17.143 12.571 28 12.571s21.143-4.571 28-12.571l182.857-219.429c5.714-6.286 8.571-14.857 8.571-23.429 0-20-16.571-36.571-36.571-36.571h-109.714v-219.429h329.143c5.143 0 10.857-2.286 14.286-6.286l91.429-109.714c2.286-3.429 4-8 4-12zM1097.143 329.143c0-8.571-2.857-17.143-8.571-23.429l-182.857-219.429c-6.857-8-17.143-13.143-28-13.143s-21.143 5.143-28 13.143l-182.857 219.429c-5.714 6.286-8.571 14.857-8.571 23.429 0 20 16.571 36.571 36.571 36.571h109.714v219.429h-329.143c-5.143 0-10.857 2.286-14.286 6.857l-91.429 109.714c-2.286 2.857-4 7.429-4 11.429 0 9.714 8.571 18.286 18.286 18.286h548.571c21.143 0 18.286-22.286 18.286-36.571v-329.143h109.714c20 0 36.571-16.571 36.571-36.571z" />
-<glyph unicode="&#xe912;" glyph-name="arrow-left" d="M598 640.667v-428l-214 214z" />
-<glyph unicode="&#xe913;" glyph-name="arrow-up" d="M298 340.667l214 214 214-214h-428z" />
-<glyph unicode="&#xe914;" glyph-name="arrow-down" d="M298 512.667h428l-214-214z" />
-<glyph unicode="&#xe915;" glyph-name="home" horiz-adv-x="951" d="M804.571 384v-274.286c0-20-16.571-36.571-36.571-36.571h-219.429v219.429h-146.286v-219.429h-219.429c-20 0-36.571 16.571-36.571 36.571v274.286c0 1.143 0.571 2.286 0.571 3.429l328.571 270.857 328.571-270.857c0.571-1.143 0.571-2.286 0.571-3.429zM932 423.428l-35.429-42.286c-2.857-3.429-7.429-5.714-12-6.286h-1.714c-4.571 0-8.571 1.143-12 4l-395.429 329.714-395.429-329.714c-4-2.857-8.571-4.571-13.714-4-4.571 0.571-9.143 2.857-12 6.286l-35.429 42.286c-6.286 7.429-5.143 19.429 2.286 25.714l410.857 342.286c24 20 62.857 20 86.857 0l139.429-116.571v111.429c0 10.286 8 18.286 18.286 18.286h109.714c10.286 0 18.286-8 18.286-18.286v-233.143l125.143-104c7.429-6.286 8.571-18.286 2.286-25.714z" />
-<glyph unicode="&#xe916;" glyph-name="local" horiz-adv-x="1097" d="M338.857 438.857c-59.429-1.714-113.143-27.429-151.429-73.143h-76.571c-57.143 0-110.857 27.429-110.857 90.857 0 46.286-1.714 201.714 70.857 201.714 12 0 71.429-48.571 148.571-48.571 26.286 0 51.429 4.571 76 13.143-1.714-12.571-2.857-25.143-2.857-37.714 0-52 16.571-103.429 46.286-146.286zM950.857 74.857c0-92.571-61.143-148-152.571-148h-499.429c-91.429 0-152.571 55.429-152.571 148 0 129.143 30.286 327.429 197.714 327.429 19.429 0 90.286-79.429 204.571-79.429s185.143 79.429 204.571 79.429c167.429 0 197.714-198.286 197.714-327.429zM365.714 804.571c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286 65.714 146.286 146.286 146.286 146.286-65.714 146.286-146.286zM768 585.143c0-121.143-98.286-219.429-219.429-219.429s-219.429 98.286-219.429 219.429 98.286 219.429 219.429 219.429 219.429-98.286 219.429-219.429zM1097.143 456.571c0-63.429-53.714-90.857-110.857-90.857h-76.571c-38.286 45.714-92 71.429-151.429 73.143 29.714 42.857 46.286 94.286 46.286 146.286 0 12.571-1.143 25.143-2.857 37.714 24.571-8.571 49.714-13.143 76-13.143 77.143 0 136.571 48.571 148.571 48.571 72.571 0 70.857-155.429 70.857-201.714zM1024 804.571c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286 65.714 146.286 146.286 146.286 146.286-65.714 146.286-146.286z" />
-<glyph unicode="&#xe917;" glyph-name="dots-three" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM153.651 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64zM870.451 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
-<glyph unicode="&#xe918;" glyph-name="check" d="M424.653 102.502c-22.272 0-43.366 10.394-56.883 28.314l-182.938 241.715c-23.808 31.386-17.613 76.083 13.824 99.891 31.488 23.91 76.186 17.613 99.994-13.824l120.371-158.925 302.643 485.99c20.838 33.382 64.87 43.622 98.355 22.784 33.434-20.787 43.725-64.819 22.835-98.304l-357.581-573.952c-12.39-20.019-33.843-32.512-57.344-33.587-1.126-0.102-2.15-0.102-3.277-0.102z" />
-<glyph unicode="&#xe919;" glyph-name="dots-three-vertical" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM512.051 706.56c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64zM512.051 215.040c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
-<glyph unicode="&#xe91a;" glyph-name="bookmark" horiz-adv-x="731" d="M665.143 877.714c8.571 0 17.143-1.714 25.143-5.143 25.143-9.714 41.143-33.143 41.143-58.857v-736.571c0-25.714-16-49.143-41.143-58.857-8-3.429-16.571-4.571-25.143-4.571-17.714 0-34.286 6.286-47.429 18.286l-252 242.286-252-242.286c-13.143-12-29.714-18.857-47.429-18.857-8.571 0-17.143 1.714-25.143 5.143-25.143 9.714-41.143 33.143-41.143 58.857v736.571c0 25.714 16 49.143 41.143 58.857 8 3.429 16.571 5.143 25.143 5.143h598.857z" />
-<glyph unicode="&#xe91b;" glyph-name="warning" d="M907.5 204.9l-345.1 558.4c-27.8 44.9-73 45-100.8 0v0l-345.1-558.4c-37.3-60.3-10.2-108.9 60.4-108.9h670.2c70.5 0 97.6 48.7 60.4 108.9zM512 192c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zM544 351.9c0-17.4-14.3-31.9-32-31.9-17.8 0-32 14.3-32 31.9v192.2c0 17.4 14.3 31.9 32 31.9v0c17.8 0 32-14.3 32-31.9v-192.2z" />
+<glyph unicode="&#xe900;" glyph-name="question-circle" horiz-adv-x="878" d="M512 164.571v109.714c0 10.286-8 18.286-18.286 18.286h-109.714c-10.286 0-18.286-8-18.286-18.286v-109.714c0-10.286 8-18.286 18.286-18.286h109.714c10.286 0 18.286 8 18.286 18.286zM658.286 548.571c0 104.571-109.714 182.857-208 182.857-93.143 0-162.857-40-212-121.714-5.143-8-2.857-18.286 4.571-24l75.429-57.143c2.857-2.286 6.857-3.429 10.857-3.429 5.143 0 10.857 2.286 14.286 6.857 26.857 34.286 38.286 44.571 49.143 52.571 9.714 6.857 28.571 13.714 49.143 13.714 36.571 0 70.286-23.429 70.286-48.571 0-29.714-15.429-44.571-50.286-60.571-40.571-18.286-96-65.714-96-121.143v-20.571c0-10.286 8-18.286 18.286-18.286h109.714c10.286 0 18.286 8 18.286 18.286v0c0 13.143 16.571 41.143 43.429 56.571 43.429 24.571 102.857 57.714 102.857 144.571zM877.714 438.857c0-242.286-196.571-438.857-438.857-438.857s-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857 438.857-196.571 438.857-438.857z" />
+<glyph unicode="&#xe901;" glyph-name="book" d="M480 132v628c0 0-86.016 72-208 72s-208-64-208-64v-636c0 0 86.016 62.016 208 62.016s208-62.016 208-62.016zM928 132v628c0 0-86.016 72-208 72s-208-64-208-64v-636c0 0 86.016 62.016 208 62.016s208-62.016 208-62.016zM992 704h-32v-608h-384v-32h-160v32h-384v608h-32v-640h384v-32h225.984l-1.984 32h384v640z" />
+<glyph unicode="&#xe902;" glyph-name="envelope" d="M921.6 870.4c56.554 0 102.4-45.846 102.4-102.4v0-614.4c0-56.554-45.846-102.4-102.4-102.4v0h-819.2c-56.554 0-102.4 45.846-102.4 102.4v0 614.4c0 56.32 46.080 102.4 102.4 102.4h819.2zM697.856 404.48l326.144-250.88v102.4l-262.144 199.68 262.144 209.92v102.4l-512-409.6-512 409.6v-102.4l262.144-209.92-262.144-199.68v-102.4l326.144 250.88 185.856-148.48 185.856 148.48z" />
+<glyph unicode="&#xe903;" glyph-name="arrow-right" d="M426 212.667v428l214-214z" />
+<glyph unicode="&#xe904;" glyph-name="bell" d="M521.143-18.286c0 5.143-4 9.143-9.143 9.143-45.143 0-82.286 37.143-82.286 82.286 0 5.143-4 9.143-9.143 9.143s-9.143-4-9.143-9.143c0-55.429 45.143-100.571 100.571-100.571 5.143 0 9.143 4 9.143 9.143zM987.429 146.286c0-40-33.143-73.143-73.143-73.143h-256c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286h-256c-40 0-73.143 33.143-73.143 73.143 84.571 71.429 182.857 199.429 182.857 475.429 0 109.714 90.857 229.714 242.286 252-2.857 6.857-4.571 14.286-4.571 22.286 0 30.286 24.571 54.857 54.857 54.857s54.857-24.571 54.857-54.857c0-8-1.714-15.429-4.571-22.286 151.429-22.286 242.286-142.286 242.286-252 0-276 98.286-404 182.857-475.429z" />
+<glyph unicode="&#xe905;" glyph-name="x" d="M960 179.264l-268.992 268.736 268.992 268.736-179.264 179.264-268.736-268.864-268.864 268.864-179.136-179.264 268.736-268.736-268.736-268.736 179.136-179.264 268.864 268.864 268.736-268.864z" />
+<glyph unicode="&#xe906;" glyph-name="quote-close" horiz-adv-x="951" d="M438.857 768v-402.286c0-161.143-131.429-292.571-292.571-292.571h-36.571c-20 0-36.571 16.571-36.571 36.571v73.143c0 20 16.571 36.571 36.571 36.571h36.571c80.571 0 146.286 65.714 146.286 146.286v18.286c0 30.286-24.571 54.857-54.857 54.857h-128c-60.571 0-109.714 49.143-109.714 109.714v219.429c0 60.571 49.143 109.714 109.714 109.714h219.429c60.571 0 109.714-49.143 109.714-109.714zM950.857 768v-402.286c0-161.143-131.429-292.571-292.571-292.571h-36.571c-20 0-36.571 16.571-36.571 36.571v73.143c0 20 16.571 36.571 36.571 36.571h36.571c80.571 0 146.286 65.714 146.286 146.286v18.286c0 30.286-24.571 54.857-54.857 54.857h-128c-60.571 0-109.714 49.143-109.714 109.714v219.429c0 60.571 49.143 109.714 109.714 109.714h219.429c60.571 0 109.714-49.143 109.714-109.714z" />
+<glyph unicode="&#xe907;" glyph-name="quote-open" horiz-adv-x="951" d="M438.857 402.286v-219.429c0-60.571-49.143-109.714-109.714-109.714h-219.429c-60.571 0-109.714 49.143-109.714 109.714v402.286c0 161.143 131.429 292.571 292.571 292.571h36.571c20 0 36.571-16.571 36.571-36.571v-73.143c0-20-16.571-36.571-36.571-36.571h-36.571c-80.571 0-146.286-65.714-146.286-146.286v-18.286c0-30.286 24.571-54.857 54.857-54.857h128c60.571 0 109.714-49.143 109.714-109.714zM950.857 402.286v-219.429c0-60.571-49.143-109.714-109.714-109.714h-219.429c-60.571 0-109.714 49.143-109.714 109.714v402.286c0 161.143 131.429 292.571 292.571 292.571h36.571c20 0 36.571-16.571 36.571-36.571v-73.143c0-20-16.571-36.571-36.571-36.571h-36.571c-80.571 0-146.286-65.714-146.286-146.286v-18.286c0-30.286 24.571-54.857 54.857-54.857h128c60.571 0 109.714-49.143 109.714-109.714z" />
+<glyph unicode="&#xe908;" glyph-name="image" horiz-adv-x="1097" d="M365.714 621.714c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM950.857 402.286v-256h-804.571v109.714l182.857 182.857 91.429-91.429 292.571 292.571zM1005.714 804.571h-914.286c-9.714 0-18.286-8.571-18.286-18.286v-694.857c0-9.714 8.571-18.286 18.286-18.286h914.286c9.714 0 18.286 8.571 18.286 18.286v694.857c0 9.714-8.571 18.286-18.286 18.286zM1097.143 786.286v-694.857c0-50.286-41.143-91.429-91.429-91.429h-914.286c-50.286 0-91.429 41.143-91.429 91.429v694.857c0 50.286 41.143 91.429 91.429 91.429h914.286c50.286 0 91.429-41.143 91.429-91.429z" />
+<glyph unicode="&#xe909;" glyph-name="pencil" horiz-adv-x="866" d="M207.429 73.143l52 52-134.286 134.286-52-52v-61.143h73.143v-73.143h61.143zM506.286 603.428c0 7.429-5.143 12.571-12.571 12.571-3.429 0-6.857-1.143-9.714-4l-309.714-309.714c-2.857-2.857-4-6.286-4-9.714 0-7.429 5.143-12.571 12.571-12.571 3.429 0 6.857 1.143 9.714 4l309.714 309.714c2.857 2.857 4 6.286 4 9.714zM475.429 713.143l237.714-237.714-475.429-475.429h-237.714v237.714zM865.714 658.286c0-19.429-8-38.286-21.143-51.429l-94.857-94.857-237.714 237.714 94.857 94.286c13.143 13.714 32 21.714 51.429 21.714s38.286-8 52-21.714l134.286-133.714c13.143-13.714 21.143-32.571 21.143-52z" />
+<glyph unicode="&#xe90a;" glyph-name="list" d="M219.429 146.286c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM219.429 438.857c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM1024 201.143v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286zM219.429 731.428c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM1024 493.714v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286zM1024 786.286v-109.714c0-9.714-8.571-18.286-18.286-18.286h-694.857c-9.714 0-18.286 8.571-18.286 18.286v109.714c0 9.714 8.571 18.286 18.286 18.286h694.857c9.714 0 18.286-8.571 18.286-18.286z" />
+<glyph unicode="&#xe90b;" glyph-name="unlock" horiz-adv-x="951" d="M950.857 621.714v-146.286c0-20-16.571-36.571-36.571-36.571h-36.571c-20 0-36.571 16.571-36.571 36.571v146.286c0 80.571-65.714 146.286-146.286 146.286s-146.286-65.714-146.286-146.286v-109.714h54.857c30.286 0 54.857-24.571 54.857-54.857v-329.143c0-30.286-24.571-54.857-54.857-54.857h-548.571c-30.286 0-54.857 24.571-54.857 54.857v329.143c0 30.286 24.571 54.857 54.857 54.857h384v109.714c0 141.143 114.857 256 256 256s256-114.857 256-256z" />
+<glyph unicode="&#xe90c;" glyph-name="globe" horiz-adv-x="878" d="M438.857 877.714c242.286 0 438.857-196.571 438.857-438.857s-196.571-438.857-438.857-438.857-438.857 196.571-438.857 438.857 196.571 438.857 438.857 438.857zM595.429 580c-4.571-3.429-7.429-9.714-13.143-10.857 2.857 0.571 5.714 10.857 7.429 13.143 3.429 4 8 6.286 12.571 8.571 9.714 4 19.429 5.143 29.714 6.857 9.714 2.286 21.714 2.286 29.143-6.286-1.714 1.714 12 13.714 13.714 14.286 5.143 2.857 13.714 1.714 17.143 6.857 1.143 1.714 1.143 12.571 1.143 12.571-9.714-1.143-13.143 8-13.714 16 0-0.571-1.143-2.286-3.429-4.571 0.571 8.571-10.286 2.286-14.286 3.429-13.143 3.429-11.429 12.571-15.429 22.286-2.286 5.143-8.571 6.857-10.857 12-2.286 3.429-3.429 10.857-8.571 11.429-3.429 0.571-9.714-12-10.857-11.429-5.143 2.857-7.429-1.143-11.429-3.429-3.429-2.286-6.286-1.143-9.714-2.857 10.286 3.429-4.571 9.143-9.714 8 8 2.286 4 10.857-0.571 14.857h2.857c-1.143 5.143-17.143 9.714-22.286 13.143s-32.571 9.143-38.286 5.714c-6.857-4 1.714-15.429 1.714-21.143 0.571-6.857-6.857-8.571-6.857-14.286 0-9.714 18.286-8 13.714-21.143-2.857-8-13.714-9.714-18.286-16-4.571-5.714 0.571-16 5.143-20 4.571-3.429-8-9.143-9.714-10.286-9.714-4.571-17.143 9.714-19.429 18.286-1.714 6.286-2.286 13.714-9.143 17.143-3.429 1.143-14.286 2.857-16.571-0.571-3.429 8.571-15.429 12-23.429 14.857-11.429 4-21.143 4-33.143 2.286 4 0.571-1.143 18.286-10.857 15.429 2.857 5.714 1.714 12 2.857 17.714 1.143 4.571 3.429 9.143 6.857 13.143 1.143 2.286 13.714 15.429 9.714 16 9.714-1.143 20.571-1.714 28.571 6.286 5.143 5.143 7.429 13.714 12.571 19.429 7.429 8.571 16.571-2.286 24.571-2.857 11.429-0.571 10.857 12 4.571 17.714 7.429-0.571 1.143 13.143-2.857 14.857-5.143 1.714-24.571-3.429-14.286-7.429-2.286 1.143-16-27.429-24-13.143-2.286 2.857-3.429 14.857-8.571 15.429-4.571 0-7.429-5.143-9.143-8.571 2.857 7.429-16 12.571-20 13.143 8.571 5.714 1.714 12-4.571 15.429-4.571 2.857-18.857 5.143-22.857 0.571-10.857-13.143 11.429-14.857 17.143-18.286 1.714-1.143 8.571-5.143 4.571-8-3.429-1.714-13.714-4.571-14.857-6.857-3.429-5.143 4-10.857-1.143-16-5.143 5.143-5.143 13.714-9.143 19.429 5.143-6.286-20.571-2.857-20-2.857-8.571 0-22.286-5.714-28.571 2.857-1.143 2.286-1.143 15.429 2.286 12.571-5.143 4-8.571 8-12 10.286-18.857-6.286-36.571-14.286-53.714-23.429 2.286-0.571 4-0.571 6.857 0.571 4.571 1.714 8.571 4.571 13.143 6.857 5.714 2.286 17.714 9.143 24 4 0.571 1.143 2.286 2.286 2.857 2.857 4-4.571 8-9.143 11.429-14.286-4.571 2.286-12 1.143-17.143 0.571-4-1.143-10.857-2.286-12.571-6.857 1.714-2.857 4-7.429 2.857-10.286-7.429 5.143-13.143 13.714-23.429 14.857-4.571 0-9.143 0-12.571-0.571-54.857-30.286-101.143-74.286-134.286-126.857 2.286-2.286 4.571-4 6.857-4.571 5.714-1.714 0-18.286 10.857-9.714 3.429-2.857 4-6.857 1.714-10.857 0.571 0.571 23.429-14.286 25.143-15.429 4-3.429 10.286-7.429 12-12 1.143-4-2.286-8.571-5.714-10.286-0.571 1.143-9.143 9.714-10.286 7.429-1.714-2.857 0-18.286 6.286-17.714-9.143-0.571-5.143-36-7.429-42.857 0-0.571 1.143-0.571 1.143-0.571-1.714-6.857 4-33.714 15.429-30.857-7.429-1.714 13.143-28 16-29.714 7.429-5.143 16-8.571 21.143-16 5.714-8 5.714-20 13.714-26.286-2.286-6.857 12-14.857 11.429-24.571-1.143-0.571-1.714-0.571-2.857-1.143 2.857-8 13.714-8 17.714-15.429 2.286-4.571 0-15.429 7.429-13.143 1.143 12.571-7.429 25.143-13.714 35.429-3.429 5.714-6.857 10.857-9.714 16.571-2.857 5.143-3.429 11.429-5.714 17.143 2.286-0.571 14.857-5.143 13.714-6.857-4.571-11.429 18.286-31.429 24.571-38.857 1.714-1.714 14.857-18.857 8-18.857 7.429 0 17.714-11.429 21.143-17.143 5.143-8.571 4-19.429 7.429-28.571 3.429-11.429 19.429-16.571 28.571-21.714 8-4 14.857-9.714 22.857-12.571 12-4.571 14.857-0.571 25.143 1.143 14.857 2.286 16.571-14.286 28.571-20.571 7.429-4 23.429-9.714 31.429-6.286-3.429-1.143 12-24.571 13.143-26.286 5.143-6.857 14.857-10.286 20.571-17.143 1.714 1.143 3.429 2.857 4 5.143-2.286-6.286 8.571-18.286 14.286-17.143 6.286 1.143 8 13.714 8 18.286-11.429-5.714-21.714-1.143-28 10.286-1.143 2.857-10.286 18.857-2.286 18.857 10.857 0 3.429 8.571 2.286 16.571s-9.143 13.143-13.143 20c-3.429-6.857-14.857-5.143-18.286 0.571 0-1.714-1.714-4.571-1.714-6.857-2.857 0-5.714-0.571-8.571 0.571 1.143 6.857 1.714 15.429 3.429 22.857 2.857 10.286 21.714 30.286-2.857 29.143-8.571-0.571-12-4-14.857-11.429-2.857-6.857-1.714-13.143-9.714-16.571-5.143-2.286-22.286-1.143-27.429 1.714-10.857 6.286-18.286 26.286-18.286 37.714-0.571 15.429 7.429 29.143 0 43.429 3.429 2.857 6.857 8.571 10.857 11.429 3.429 2.286 7.429-1.714 9.143 5.143-1.714 1.143-4 3.429-4.571 3.429 8.571-4 24.571 5.714 32 0 4.571-3.429 9.714-4.571 12.571 1.143 0.571 1.714-4 8.571-1.714 13.143 1.714-9.714 8-11.429 16.571-5.143 3.429-3.429 12.571-2.286 18.857-5.714 6.286-4 7.429-10.286 14.857-1.714 4.571-6.857 5.143-6.857 6.857-13.714 1.714-6.286 5.143-22.286 10.857-25.143 12-7.429 9.143 12.571 8 19.429-0.571 0.571-0.571 19.429-1.143 19.429-18.286 4-11.429 18.286-1.143 28 1.714 1.143 14.857 5.714 20.571 10.286 5.143 4.571 11.429 12.571 8.571 20 2.857 0 5.143 2.286 6.286 5.143-1.714 0.571-8.571 6.286-9.714 5.714 4 2.286 3.429 5.714 1.143 9.143 5.714 3.429 2.857 9.714 8.571 12 6.286-8.571 18.857 1.143 12.571 8 5.714 8 18.857 4 22.286 11.429 8.571-2.286 2.286 8.571 6.857 14.857 4 5.143 10.857 5.143 16 8 0-0.571 14.286 8 9.714 8.571 9.714-1.143 29.143 9.143 14.286 17.714 2.286 5.143-5.143 7.429-10.286 8.571 4 1.143 9.143-1.143 12.571 1.143 7.429 5.143 2.286 7.429-4 9.143-8 2.286-18.286-2.857-24.571-6.857zM502.286 78.857c78.286 13.714 148 52.571 200.571 108-3.429 3.429-9.714 2.286-14.286 4.571-4.571 1.714-8 3.429-13.714 4.571 1.143 11.429-11.429 15.429-19.429 21.143-7.429 5.714-12 12-22.857 9.714-1.143-0.571-12.571-4.571-10.286-6.857-7.429 6.286-10.857 9.714-20.571 12.571-9.143 2.857-15.429 14.286-24.571 4-4.571-4.571-2.286-11.429-4.571-16-7.429 6.286 6.857 13.714 1.143 20.571-6.857 8-18.857-5.143-24.571-8.571-3.429-2.857-7.429-4-9.714-7.429-2.857-4-4-9.143-6.286-13.143-1.714 4.571-11.429 3.429-12 6.857 2.286-13.714 2.286-28 5.143-41.714 1.714-8 0-21.143-6.857-27.429s-15.429-13.143-16.571-22.857c-1.143-6.857 0.571-13.143 6.857-14.857 0.571-8.571-9.143-14.857-8.571-24 0-0.571 0.571-6.286 1.143-9.143z" />
+<glyph unicode="&#xe90d;" glyph-name="lock" horiz-adv-x="658" d="M182.857 512h292.571v109.714c0 80.571-65.714 146.286-146.286 146.286s-146.286-65.714-146.286-146.286v-109.714zM658.286 457.143v-329.143c0-30.286-24.571-54.857-54.857-54.857h-548.571c-30.286 0-54.857 24.571-54.857 54.857v329.143c0 30.286 24.571 54.857 54.857 54.857h18.286v109.714c0 140.571 115.429 256 256 256s256-115.429 256-256v-109.714h18.286c30.286 0 54.857-24.571 54.857-54.857z" />
+<glyph unicode="&#xe90e;" glyph-name="chain-broken" horiz-adv-x="951" d="M250.857 224.571l-146.286-146.286c-4-3.429-8.571-5.143-13.143-5.143s-9.143 1.714-13.143 5.143c-6.857 7.429-6.857 18.857 0 26.286l146.286 146.286c7.429 6.857 18.857 6.857 26.286 0 6.857-7.429 6.857-18.857 0-26.286zM347.429 201.143v-182.857c0-10.286-8-18.286-18.286-18.286s-18.286 8-18.286 18.286v182.857c0 10.286 8 18.286 18.286 18.286s18.286-8 18.286-18.286zM219.429 329.143c0-10.286-8-18.286-18.286-18.286h-182.857c-10.286 0-18.286 8-18.286 18.286s8 18.286 18.286 18.286h182.857c10.286 0 18.286-8 18.286-18.286zM941.714 256c0-44-17.143-85.143-48.571-116l-84-83.429c-30.857-30.857-72-47.429-116-47.429s-85.714 17.143-116.571 48.571l-190.857 191.429c-9.714 9.714-17.143 20.571-24 32l136.571 10.286 156-156.571c20.571-20.571 57.143-21.143 77.714-0.571l84 83.429c10.286 10.286 16 24 16 38.286 0 14.857-5.714 28.571-16 38.857l-156.571 157.143 10.286 136.571c11.429-6.857 22.286-14.286 32-24l192-192c30.857-31.429 48-72.571 48-116.571zM589.143 669.714l-136.571-10.286-156 156.571c-10.286 10.286-24 16-38.857 16s-28.571-5.714-38.857-15.429l-84-83.429c-10.286-10.286-16-24-16-38.286 0-14.857 5.714-28.571 16-38.857l156.571-156.571-10.286-137.143c-11.429 6.857-22.286 14.286-32 24l-192 192c-30.857 31.429-48 72.571-48 116.571s17.143 85.143 48.571 116l84 83.429c30.857 30.857 72 47.429 116 47.429s85.714-17.143 116.571-48.571l190.857-191.429c9.714-9.714 17.143-20.571 24-32zM950.857 621.714c0-10.286-8-18.286-18.286-18.286h-182.857c-10.286 0-18.286 8-18.286 18.286s8 18.286 18.286 18.286h182.857c10.286 0 18.286-8 18.286-18.286zM640 932.571v-182.857c0-10.286-8-18.286-18.286-18.286s-18.286 8-18.286 18.286v182.857c0 10.286 8 18.286 18.286 18.286s18.286-8 18.286-18.286zM872.571 846.286l-146.286-146.286c-4-3.429-8.571-5.143-13.143-5.143s-9.143 1.714-13.143 5.143c-6.857 7.429-6.857 18.857 0 26.286l146.286 146.286c7.429 6.857 18.857 6.857 26.286 0 6.857-7.429 6.857-18.857 0-26.286z" />
+<glyph unicode="&#xe90f;" glyph-name="chain" horiz-adv-x="951" d="M832 256c0 14.857-5.714 28.571-16 38.857l-118.857 118.857c-10.286 10.286-24.571 16-38.857 16-16.571 0-29.714-6.286-41.143-18.286 18.857-18.857 41.143-34.857 41.143-64 0-30.286-24.571-54.857-54.857-54.857-29.143 0-45.143 22.286-64 41.143-12-11.429-18.857-24.571-18.857-41.714 0-14.286 5.714-28.571 16-38.857l117.714-118.286c10.286-10.286 24.571-15.429 38.857-15.429s28.571 5.143 38.857 14.857l84 83.429c10.286 10.286 16 24 16 38.286zM430.286 658.857c0 14.286-5.714 28.571-16 38.857l-117.714 118.286c-10.286 10.286-24.571 16-38.857 16s-28.571-5.714-38.857-15.429l-84-83.429c-10.286-10.286-16-24-16-38.286 0-14.857 5.714-28.571 16-38.857l118.857-118.857c10.286-10.286 24.571-15.429 38.857-15.429 16.571 0 29.714 5.714 41.143 17.714-18.857 18.857-41.143 34.857-41.143 64 0 30.286 24.571 54.857 54.857 54.857 29.143 0 45.143-22.286 64-41.143 12 11.429 18.857 24.571 18.857 41.714zM941.714 256c0-43.429-17.714-85.714-48.571-116l-84-83.429c-30.857-30.857-72.571-47.429-116-47.429-44 0-85.714 17.143-116.571 48.571l-117.714 118.286c-30.857 30.857-47.429 72.571-47.429 116 0 45.143 18.286 88 50.286 119.429l-50.286 50.286c-31.429-32-73.714-50.286-118.857-50.286-43.429 0-85.714 17.143-116.571 48l-118.857 118.857c-31.429 31.429-48 72.571-48 116.571 0 43.429 17.714 85.714 48.571 116l84 83.429c30.857 30.857 72.571 47.429 116 47.429 44 0 85.714-17.143 116.571-48.571l117.714-118.286c30.857-30.857 47.429-72.571 47.429-116 0-45.143-18.286-88-50.286-119.429l50.286-50.286c31.429 32 73.714 50.286 118.857 50.286 43.429 0 85.714-17.143 116.571-48l118.857-118.857c31.429-31.429 48-72.571 48-116.571z" />
+<glyph unicode="&#xe910;" glyph-name="comments" d="M804.571 512c0-161.714-180-292.571-402.286-292.571-34.857 0-68.571 3.429-100.571 9.143-47.429-33.714-101.143-58.286-158.857-73.143-15.429-4-32-6.857-49.143-9.143h-1.714c-8.571 0-16.571 6.857-18.286 16.571v0c-2.286 10.857 5.143 17.714 11.429 25.143 22.286 25.143 47.429 47.429 66.857 94.857-92.571 53.714-152 136.571-152 229.143 0 161.714 180 292.571 402.286 292.571s402.286-130.857 402.286-292.571zM1024 365.714c0-93.143-59.429-175.429-152-229.143 19.429-47.429 44.571-69.714 66.857-94.857 6.286-7.429 13.714-14.286 11.429-25.143v0c-2.286-10.286-10.857-17.714-20-16.571-17.143 2.286-33.714 5.143-49.143 9.143-57.714 14.857-111.429 39.429-158.857 73.143-32-5.714-65.714-9.143-100.571-9.143-103.429 0-198.286 28.571-269.714 75.429 16.571-1.143 33.714-2.286 50.286-2.286 122.857 0 238.857 35.429 327.429 99.429 95.429 69.714 148 164 148 266.286 0 29.714-4.571 58.857-13.143 86.857 96.571-53.143 159.429-137.714 159.429-233.143z" />
+<glyph unicode="&#xe911;" glyph-name="comment" d="M1024 438.857c0-202.286-229.143-365.714-512-365.714-28 0-56 1.714-82.857 4.571-74.857-66.286-164-113.143-262.857-138.286-20.571-5.714-42.857-9.714-65.143-12.571-12.571-1.143-24.571 8-27.429 21.714v0.571c-2.857 14.286 6.857 22.857 15.429 33.143 36 40.571 77.143 74.857 104 170.286-117.714 66.857-193.143 170.286-193.143 286.286 0 201.714 229.143 365.714 512 365.714s512-163.429 512-365.714z" />
+<glyph unicode="&#xe912;" glyph-name="boost" horiz-adv-x="1097" d="M731.429 91.428c0-9.714-8.571-18.286-18.286-18.286h-548.571c-21.143 0-18.286 22.286-18.286 36.571v329.143h-109.714c-20 0-36.571 16.571-36.571 36.571 0 8.571 2.857 17.143 8.571 23.429l182.857 219.429c6.857 8 17.143 12.571 28 12.571s21.143-4.571 28-12.571l182.857-219.429c5.714-6.286 8.571-14.857 8.571-23.429 0-20-16.571-36.571-36.571-36.571h-109.714v-219.429h329.143c5.143 0 10.857-2.286 14.286-6.286l91.429-109.714c2.286-3.429 4-8 4-12zM1097.143 329.143c0-8.571-2.857-17.143-8.571-23.429l-182.857-219.429c-6.857-8-17.143-13.143-28-13.143s-21.143 5.143-28 13.143l-182.857 219.429c-5.714 6.286-8.571 14.857-8.571 23.429 0 20 16.571 36.571 36.571 36.571h109.714v219.429h-329.143c-5.143 0-10.857 2.286-14.286 6.857l-91.429 109.714c-2.286 2.857-4 7.429-4 11.429 0 9.714 8.571 18.286 18.286 18.286h548.571c21.143 0 18.286-22.286 18.286-36.571v-329.143h109.714c20 0 36.571-16.571 36.571-36.571z" />
+<glyph unicode="&#xe913;" glyph-name="arrow-left" d="M598 640.667v-428l-214 214z" />
+<glyph unicode="&#xe914;" glyph-name="arrow-up" d="M298 340.667l214 214 214-214h-428z" />
+<glyph unicode="&#xe915;" glyph-name="arrow-down" d="M298 512.667h428l-214-214z" />
+<glyph unicode="&#xe917;" glyph-name="local" horiz-adv-x="1097" d="M338.857 438.857c-59.429-1.714-113.143-27.429-151.429-73.143h-76.571c-57.143 0-110.857 27.429-110.857 90.857 0 46.286-1.714 201.714 70.857 201.714 12 0 71.429-48.571 148.571-48.571 26.286 0 51.429 4.571 76 13.143-1.714-12.571-2.857-25.143-2.857-37.714 0-52 16.571-103.429 46.286-146.286zM950.857 74.857c0-92.571-61.143-148-152.571-148h-499.429c-91.429 0-152.571 55.429-152.571 148 0 129.143 30.286 327.429 197.714 327.429 19.429 0 90.286-79.429 204.571-79.429s185.143 79.429 204.571 79.429c167.429 0 197.714-198.286 197.714-327.429zM365.714 804.571c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286 65.714 146.286 146.286 146.286 146.286-65.714 146.286-146.286zM768 585.143c0-121.143-98.286-219.429-219.429-219.429s-219.429 98.286-219.429 219.429 98.286 219.429 219.429 219.429 219.429-98.286 219.429-219.429zM1097.143 456.571c0-63.429-53.714-90.857-110.857-90.857h-76.571c-38.286 45.714-92 71.429-151.429 73.143 29.714 42.857 46.286 94.286 46.286 146.286 0 12.571-1.143 25.143-2.857 37.714 24.571-8.571 49.714-13.143 76-13.143 77.143 0 136.571 48.571 148.571 48.571 72.571 0 70.857-155.429 70.857-201.714zM1024 804.571c0-80.571-65.714-146.286-146.286-146.286s-146.286 65.714-146.286 146.286 65.714 146.286 146.286 146.286 146.286-65.714 146.286-146.286z" />
+<glyph unicode="&#xe918;" glyph-name="dots-three" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM153.651 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64zM870.451 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
+<glyph unicode="&#xe919;" glyph-name="check" d="M424.653 102.502c-22.272 0-43.366 10.394-56.883 28.314l-182.938 241.715c-23.808 31.386-17.613 76.083 13.824 99.891 31.488 23.91 76.186 17.613 99.994-13.824l120.371-158.925 302.643 485.99c20.838 33.382 64.87 43.622 98.355 22.784 33.434-20.787 43.725-64.819 22.835-98.304l-357.581-573.952c-12.39-20.019-33.843-32.512-57.344-33.587-1.126-0.102-2.15-0.102-3.277-0.102z" />
+<glyph unicode="&#xe91a;" glyph-name="dots-three-vertical" d="M512.051 573.44c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64zM512.051 706.56c62.208 0 112.589 50.483 112.589 112.64s-50.381 112.64-112.589 112.64c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64zM512.051 215.040c-62.208 0-112.691-50.432-112.691-112.64s50.483-112.64 112.691-112.64c62.208 0 112.589 50.432 112.589 112.64s-50.381 112.64-112.589 112.64z" />
+<glyph unicode="&#xe91b;" glyph-name="bookmark" horiz-adv-x="731" d="M665.143 877.714c8.571 0 17.143-1.714 25.143-5.143 25.143-9.714 41.143-33.143 41.143-58.857v-736.571c0-25.714-16-49.143-41.143-58.857-8-3.429-16.571-4.571-25.143-4.571-17.714 0-34.286 6.286-47.429 18.286l-252 242.286-252-242.286c-13.143-12-29.714-18.857-47.429-18.857-8.571 0-17.143 1.714-25.143 5.143-25.143 9.714-41.143 33.143-41.143 58.857v736.571c0 25.714 16 49.143 41.143 58.857 8 3.429 16.571 5.143 25.143 5.143h598.857z" />
+<glyph unicode="&#xe91c;" glyph-name="warning" d="M907.5 204.9l-345.1 558.4c-27.8 44.9-73 45-100.8 0v0l-345.1-558.4c-37.3-60.3-10.2-108.9 60.4-108.9h670.2c70.5 0 97.6 48.7 60.4 108.9zM512 192c-17.7 0-32 14.3-32 32s14.3 32 32 32 32-14.3 32-32-14.3-32-32-32zM544 351.9c0-17.4-14.3-31.9-32-31.9-17.8 0-32 14.3-32 31.9v192.2c0 17.4 14.3 31.9 32 31.9v0c17.8 0 32-14.3 32-31.9v-192.2z" />
 <glyph unicode="&#xe91d;" glyph-name="rss" horiz-adv-x="805" d="M219.429 182.857c0-60.571-49.143-109.714-109.714-109.714s-109.714 49.143-109.714 109.714 49.143 109.714 109.714 109.714 109.714-49.143 109.714-109.714zM512 112.571c0.571-10.286-2.857-20-9.714-27.429-6.857-8-16.571-12-26.857-12h-77.143c-18.857 0-34.286 14.286-36 33.143-16.571 174.286-154.857 312.571-329.143 329.143-18.857 1.714-33.143 17.143-33.143 36v77.143c0 10.286 4 20 12 26.857 6.286 6.286 15.429 9.714 24.571 9.714h2.857c121.714-9.714 236.571-62.857 322.857-149.714 86.857-86.286 140-201.143 149.714-322.857zM804.571 111.428c0.571-9.714-2.857-19.429-10.286-26.857-6.857-7.429-16-11.429-26.286-11.429h-81.714c-19.429 0-35.429 14.857-36.571 34.286-18.857 332-283.429 596.571-615.429 616-19.429 1.143-34.286 17.143-34.286 36v81.714c0 10.286 4 19.429 11.429 26.286 6.857 6.857 16 10.286 25.143 10.286h1.714c200-10.286 388-94.286 529.714-236.571 142.286-141.714 226.286-329.714 236.571-529.714z" />
 <glyph unicode="&#xe91e;" glyph-name="graphic-heart" d="M934.176 791.52c-116.128 115.072-301.824 117.472-422.112 9.216-120.32 108.256-305.952 105.856-422.144-9.216-119.712-118.528-119.712-310.688 0-429.28 34.208-33.888 353.696-350.112 353.696-350.112 37.856-37.504 99.072-37.504 136.896 0 0 0 349.824 346.304 353.696 350.112 119.744 118.592 119.744 310.752-0.032 429.28zM888.576 407.424l-353.696-350.112c-12.576-12.512-33.088-12.512-45.6 0l-353.696 350.112c-94.4 93.44-94.4 245.472 0 338.912 91.008 90.080 237.312 93.248 333.088 7.104l43.392-39.040 43.36 39.040c95.808 86.144 242.112 83.008 333.12-7.104 94.4-93.408 94.4-245.44 0.032-338.912zM296.096 719.968c8.864 0 16-7.168 16-16s-7.168-16-16-16h-0.032c-57.408 0-103.968-46.56-103.968-103.968v-0.032c0-8.832-7.168-16-16-16s-16 7.168-16 16v0c0 75.072 60.832 135.904 135.872 135.968 0.064 0 0.064 0.032 0.128 0.032z" />
 <glyph unicode="&#xe91f;" glyph-name="graphic-paperplane" d="M1009.376 954.88c-5.312 3.424-11.36 5.12-17.376 5.12-6.176 0-12.384-1.76-17.76-5.376l-960-640c-9.888-6.56-15.328-18.112-14.048-29.952 1.216-11.808 8.896-22.016 19.936-26.368l250.368-100.192 117.728-206.016c5.632-9.888 16.096-16 27.424-16.128 0.128 0 0.224 0 0.352 0 11.232 0 21.664 5.952 27.424 15.552l66.464 110.816 310.24-124.064c3.808-1.536 7.808-2.272 11.872-2.272 5.44 0 10.816 1.376 15.68 4.128 8.448 4.736 14.24 13.056 15.872 22.624l160 960c2.080 12.576-3.488 25.184-14.176 32.128zM100.352 295.136l741.6 494.432-539.2-577.184c-2.848 1.696-5.376 3.936-8.512 5.184l-193.888 77.568zM326.048 189.888c-0.064 0.128-0.16 0.192-0.224 0.32l606.176 648.8-516.768-805.184-89.184 156.064zM806.944 12.512l-273.312 109.312c-6.496 2.56-13.248 3.424-19.936 3.808l420.864 652.416-127.616-765.536z" />
 <glyph unicode="&#xe920;" glyph-name="graphic-banknote" d="M1005.28 621.248l-320 320c-15.872 15.872-38.88 22.24-60.672 16.864-11.488-2.816-21.76-8.736-29.888-16.864-7.264-7.264-12.736-16.256-15.872-26.304-14.496-47.008-39.552-87.872-76.64-124.928-49.536-49.504-114.048-87.008-182.304-126.656-72.448-41.984-147.296-85.504-208.64-146.816-52.128-52.192-87.616-110.24-108.416-177.632-7.008-22.752-0.896-47.36 15.872-64.192l320-320c15.872-15.872 38.88-22.24 60.672-16.864 11.488 2.88 21.76 8.736 29.888 16.864 7.264 7.264 12.736 16.256 15.872 26.368 14.528 47.008 39.584 87.872 76.704 124.928 49.504 49.504 113.984 86.944 182.304 126.56 72.384 42.048 147.264 85.568 208.576 146.88 52.128 52.128 87.616 110.24 108.448 177.632 6.976 22.72 0.832 47.424-15.904 64.16zM384 0c-105.984 105.984-214.016 214.048-320 320 90.944 294.432 485.12 281.568 576 576 105.984-105.952 214.048-214.016 320.064-320-90.976-294.368-485.152-281.568-576.064-576zM625.984 483.2c-10.432 8.736-20.928 14.688-31.488 17.632-10.496 2.944-20.992 4.128-31.616 3.36-10.496-0.8-21.248-3.2-32-7.328-10.752-4.192-21.568-8.736-32.448-14.016-17.184 19.744-34.368 39.264-51.552 57.376 7.744 7.008 15.264 10.56 22.496 10.816 7.264 0.32 14.24-0.448 20.864-2.112 6.752-1.696 12.928-3.136 18.624-4.256 5.76-1.12 10.752 0.128 15.136 3.808 4.64 4 7.2 9.184 7.552 15.424 0.32 6.304-2.048 12.448-7.328 18.432-6.752 7.744-14.88 12.448-24.64 14.176-9.632 1.696-19.488 1.568-29.76-0.672-10.112-2.304-19.744-6.112-28.864-11.488s-16.448-10.88-21.888-16.256c-2.080 1.984-4.16 3.936-6.24 5.888-2.304 2.112-5.184 3.264-8.64 3.2-3.488 0-6.368-1.504-8.736-4.256-2.304-2.688-3.36-5.824-2.944-9.12 0.32-3.424 1.696-6.048 4.064-8.064 2.080-1.76 4.16-3.488 6.24-5.312-8.192-9.888-14.944-20.8-20.256-32.32-5.376-11.552-8.576-23.008-9.76-34.112-1.248-11.2-0.064-21.44 3.36-30.944 3.424-9.568 9.76-17.696 19.008-25.376 15.072-12.512 32.8-17.824 53.376-16.64 20.512 1.248 42.624 7.36 66.4 20.128 18.88-21.824 37.824-43.488 56.736-63.616-8-6.752-15.008-10.624-21.184-11.872-6.176-1.312-11.68-1.184-16.672 0.32-4.992 1.568-9.632 3.808-13.888 6.688-4.256 2.944-8.448 5.44-12.64 7.488-4.128 2.048-8.384 3.2-12.736 3.264s-8.992-2.048-14.112-6.432c-5.248-4.576-7.872-9.888-7.872-15.872 0-5.952 2.752-12 8.128-18.112 5.44-6.112 12.512-11.264 21.056-15.328s18.208-6.624 28.832-7.328c10.624-0.736 21.824 0.864 33.632 5.248 11.872 4.32 23.616 12.128 35.2 23.744 5.568-5.44 11.2-10.624 16.8-15.616 2.368-2.048 5.248-3.072 8.736-2.816 3.36 0.128 6.304 1.696 8.64 4.512 2.368 2.88 3.36 6.048 3.008 9.376-0.32 3.36-1.696 5.952-4 7.808-5.632 4.512-11.264 9.248-16.864 14.24 9.568 11.744 17.248 24.128 22.944 36.384 5.696 12.32 9.056 24.192 10.176 35.2 1.12 11.072-0.192 21.056-3.808 30.112-3.584 9.184-9.952 17.056-19.072 24.64zM447.072 461.504c-9.056-0.384-16.96 2.624-23.872 9.312-2.944 2.816-4.992 6.24-6.24 10.304-1.312 4.064-1.76 8.512-1.248 13.376 0.448 4.8 1.888 9.824 4.384 14.88 2.368 5.056 5.888 10.112 10.368 15.008 16.224-16.128 32.416-33.824 48.64-52.128-12.288-6.752-22.976-10.368-32.032-10.752zM598.016 397.44c-2.88-5.312-6.176-10.048-10.048-14.176-17.952 18.112-35.872 38.016-53.76 58.432 4.576 2.048 9.376 4.192 14.56 6.368s10.368 3.616 15.552 4.512c5.312 0.8 10.56 0.576 15.808-0.672 5.184-1.312 10.112-4.128 14.688-8.576 4.512-4.512 7.36-9.184 8.512-14.24 1.248-5.12 1.312-10.304 0.448-15.616-0.928-5.344-2.816-10.656-5.76-16.032zM470.944 250.24c6.304 5.088 15.584 4.832 21.376-1.056 6.272-6.24 6.272-16.448 0-22.688-0.512-0.512-1.056-0.864-1.632-1.312l0.064-0.064c-20.256-15.392-36.896-29.248-54.848-47.2-16.224-16.192-30.88-33.248-43.552-50.56l-20.448-28c-0.64-1.152-1.408-2.208-2.368-3.2-6.272-6.24-16.48-6.24-22.72 0-5.44 5.44-6.112 13.824-2.112 20.064l-0.064 0.064 21.888 29.888c13.664 18.688 29.376 36.992 46.752 54.368 18.080 18.144 37.6 34.336 57.6 49.696h0.064zM588.096 713.12c16.192 16.192 30.816 33.184 43.52 50.592l21.248 29.12c0.768 1.376 1.632 2.752 2.816 3.936 6.304 6.304 16.512 6.304 22.816 0 5.984-6.016 6.24-15.52 0.8-21.888l0.064-0.064-21.888-30.016c-13.696-18.688-29.376-36.928-46.752-54.304-18.080-18.080-37.568-34.336-57.568-49.696l-0.128 0.064c-6.368-5.856-16.256-5.728-22.368 0.448-6.304 6.304-6.304 16.576 0 22.88 1.12 1.184 2.432 2.016 3.744 2.752 18.816 14.368 36.96 29.44 53.696 46.176z" />
+<glyph unicode="&#xe97a;" glyph-name="spinner" d="M384 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM655.53 719.53c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM832 448c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM719.53 176.47c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM448.002 64c0 0 0 0 0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0 0 0 0 0 0 0-35.346-28.654-64-64-64s-64 28.654-64 64zM176.472 176.47c0 0 0 0 0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0 0 0 0 0 0 0-35.346-28.654-64-64-64s-64 28.654-64 64zM144.472 719.53c0 0 0 0 0 0 0 53.019 42.981 96 96 96s96-42.981 96-96c0 0 0 0 0 0 0-53.019-42.981-96-96-96s-96 42.981-96 96zM56 448c0 39.765 32.235 72 72 72s72-32.235 72-72c0-39.765-32.235-72-72-72s-72 32.235-72 72z" />
 <glyph unicode="&#xe986;" glyph-name="search" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256z" />
 <glyph unicode="&#xe9d7;" glyph-name="star-empty" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-223.462-117.48 42.676 248.83-180.786 176.222 249.84 36.304 111.732 226.396 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
 <glyph unicode="&#xe9d8;" glyph-name="star-half" d="M1024 562.95l-353.78 51.408-158.22 320.582-158.216-320.582-353.784-51.408 256-249.538-60.432-352.352 316.432 166.358 316.432-166.358-60.434 352.352 256.002 249.538zM512 206.502l-0.942-0.496 0.942 570.768 111.736-226.396 249.836-36.304-180.788-176.222 42.678-248.83-223.462 117.48z" />
diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf
index 242ca7392..5bf90a0a7 100644
Binary files a/bookwyrm/static/css/fonts/icomoon.ttf and b/bookwyrm/static/css/fonts/icomoon.ttf differ
diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff
index 67b0f0a69..6ce6834d5 100644
Binary files a/bookwyrm/static/css/fonts/icomoon.woff and b/bookwyrm/static/css/fonts/icomoon.woff differ
diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css
index db783c24f..b43224e34 100644
--- a/bookwyrm/static/css/vendor/icons.css
+++ b/bookwyrm/static/css/vendor/icons.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('../fonts/icomoon.eot?19nagi');
-  src:  url('../fonts/icomoon.eot?19nagi#iefix') format('embedded-opentype'),
-    url('../fonts/icomoon.ttf?19nagi') format('truetype'),
-    url('../fonts/icomoon.woff?19nagi') format('woff'),
-    url('../fonts/icomoon.svg?19nagi#icomoon') format('svg');
+  src:  url('../fonts/icomoon.eot?36x4a3');
+  src:  url('../fonts/icomoon.eot?36x4a3#iefix') format('embedded-opentype'),
+    url('../fonts/icomoon.ttf?36x4a3') format('truetype'),
+    url('../fonts/icomoon.woff?36x4a3') format('woff'),
+    url('../fonts/icomoon.svg?36x4a3#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,6 +25,90 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-book:before {
+  content: "\e901";
+}
+.icon-envelope:before {
+  content: "\e902";
+}
+.icon-arrow-right:before {
+  content: "\e903";
+}
+.icon-bell:before {
+  content: "\e904";
+}
+.icon-x:before {
+  content: "\e905";
+}
+.icon-quote-close:before {
+  content: "\e906";
+}
+.icon-quote-open:before {
+  content: "\e907";
+}
+.icon-image:before {
+  content: "\e908";
+}
+.icon-pencil:before {
+  content: "\e909";
+}
+.icon-list:before {
+  content: "\e90a";
+}
+.icon-unlock:before {
+  content: "\e90b";
+}
+.icon-globe:before {
+  content: "\e90c";
+}
+.icon-lock:before {
+  content: "\e90d";
+}
+.icon-chain-broken:before {
+  content: "\e90e";
+}
+.icon-chain:before {
+  content: "\e90f";
+}
+.icon-comments:before {
+  content: "\e910";
+}
+.icon-comment:before {
+  content: "\e911";
+}
+.icon-boost:before {
+  content: "\e912";
+}
+.icon-arrow-left:before {
+  content: "\e913";
+}
+.icon-arrow-up:before {
+  content: "\e914";
+}
+.icon-arrow-down:before {
+  content: "\e915";
+}
+.icon-local:before {
+  content: "\e917";
+}
+.icon-dots-three:before {
+  content: "\e918";
+}
+.icon-check:before {
+  content: "\e919";
+}
+.icon-dots-three-vertical:before {
+  content: "\e91a";
+}
+.icon-bookmark:before {
+  content: "\e91b";
+}
+.icon-warning:before {
+  content: "\e91c";
+}
+.icon-rss:before {
+  content: "\e91d";
+}
 .icon-graphic-heart:before {
   content: "\e91e";
 }
@@ -34,102 +118,6 @@
 .icon-graphic-banknote:before {
   content: "\e920";
 }
-.icon-warning:before {
-  content: "\e91b";
-}
-.icon-book:before {
-  content: "\e900";
-}
-.icon-bookmark:before {
-  content: "\e91a";
-}
-.icon-rss:before {
-  content: "\e91d";
-}
-.icon-envelope:before {
-  content: "\e901";
-}
-.icon-arrow-right:before {
-  content: "\e902";
-}
-.icon-bell:before {
-  content: "\e903";
-}
-.icon-x:before {
-  content: "\e904";
-}
-.icon-quote-close:before {
-  content: "\e905";
-}
-.icon-quote-open:before {
-  content: "\e906";
-}
-.icon-image:before {
-  content: "\e907";
-}
-.icon-pencil:before {
-  content: "\e908";
-}
-.icon-list:before {
-  content: "\e909";
-}
-.icon-unlock:before {
-  content: "\e90a";
-}
-.icon-unlisted:before {
-  content: "\e90a";
-}
-.icon-globe:before {
-  content: "\e90b";
-}
-.icon-public:before {
-  content: "\e90b";
-}
-.icon-lock:before {
-  content: "\e90c";
-}
-.icon-followers:before {
-  content: "\e90c";
-}
-.icon-chain-broken:before {
-  content: "\e90d";
-}
-.icon-chain:before {
-  content: "\e90e";
-}
-.icon-comments:before {
-  content: "\e90f";
-}
-.icon-comment:before {
-  content: "\e910";
-}
-.icon-boost:before {
-  content: "\e911";
-}
-.icon-arrow-left:before {
-  content: "\e912";
-}
-.icon-arrow-up:before {
-  content: "\e913";
-}
-.icon-arrow-down:before {
-  content: "\e914";
-}
-.icon-home:before {
-  content: "\e915";
-}
-.icon-local:before {
-  content: "\e916";
-}
-.icon-dots-three:before {
-  content: "\e917";
-}
-.icon-check:before {
-  content: "\e918";
-}
-.icon-dots-three-vertical:before {
-  content: "\e919";
-}
 .icon-search:before {
   content: "\e986";
 }
@@ -148,3 +136,9 @@
 .icon-plus:before {
   content: "\ea0a";
 }
+.icon-question-circle:before {
+  content: "\e900";
+}
+.icon-spinner:before {
+  content: "\e97a";
+}
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 894b1fb69..f000fd082 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -301,7 +301,10 @@ let BookWyrm = new class {
     ajaxPost(form) {
         return fetch(form.action, {
             method : "POST",
-            body: new FormData(form)
+            body: new FormData(form),
+            headers: {
+                'Accept': 'application/json',
+            }
         });
     }
 
diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js
new file mode 100644
index 000000000..b3e345b19
--- /dev/null
+++ b/bookwyrm/static/js/status_cache.js
@@ -0,0 +1,236 @@
+/* exported StatusCache */
+/* globals BookWyrm */
+
+let StatusCache = new class {
+    constructor() {
+        document.querySelectorAll('[data-cache-draft]')
+            .forEach(t => t.addEventListener('change', this.updateDraft.bind(this)));
+
+        document.querySelectorAll('[data-cache-draft]')
+            .forEach(t => this.populateDraft(t));
+
+        document.querySelectorAll('.submit-status')
+            .forEach(button => button.addEventListener(
+                'submit',
+                this.submitStatus.bind(this))
+            );
+
+        document.querySelectorAll('.form-rate-stars label.icon')
+            .forEach(button => button.addEventListener('click', this.toggleStar.bind(this)));
+    }
+
+    /**
+     * Update localStorage copy of drafted status
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    updateDraft(event) {
+        // Used in set reading goal
+        let key = event.target.dataset.cacheDraft;
+        let value = event.target.value;
+
+        if (!value) {
+            window.localStorage.removeItem(key);
+
+            return;
+        }
+
+        window.localStorage.setItem(key, value);
+    }
+
+    /**
+     * Toggle display of a DOM node based on its value in the localStorage.
+     *
+     * @param {object} node - DOM node to toggle.
+     * @return {undefined}
+     */
+    populateDraft(node) {
+        // Used in set reading goal
+        let key = node.dataset.cacheDraft;
+        let value = window.localStorage.getItem(key);
+
+        if (!value) {
+            return;
+        }
+
+        node.value = value;
+    }
+
+    /**
+     * Post a status with ajax
+     *
+     * @param  {} event
+     * @return {undefined}
+     */
+    submitStatus(event) {
+        const form = event.currentTarget;
+        let trigger = event.submitter;
+
+        // Safari doesn't understand "submitter"
+        if (!trigger) {
+            trigger = event.currentTarget.querySelector("button[type=submit]");
+        }
+
+        // This allows the form to submit in the old fashioned way if there's a problem
+
+        if (!trigger || !form) {
+            return;
+        }
+
+        event.preventDefault();
+
+        BookWyrm.addRemoveClass(form, 'is-processing', true);
+        trigger.setAttribute('disabled', null);
+
+        BookWyrm.ajaxPost(form).finally(() => {
+            // Change icon to remove ongoing activity on the current UI.
+            // Enable back the element used to submit the form.
+            BookWyrm.addRemoveClass(form, 'is-processing', false);
+            trigger.removeAttribute('disabled');
+        })
+        .then(response => {
+            if (!response.ok) {
+                throw new Error();
+            }
+            this.submitStatusSuccess(form);
+        })
+        .catch(error => {
+            console.warn(error);
+            this.announceMessage('status-error-message');
+        });
+    }
+
+    /**
+     * Show a message in the live region
+     *
+     * @param  {String} the id of the message dom element
+     * @return {undefined}
+     */
+    announceMessage(message_id) {
+        const element = document.getElementById(message_id);
+        let copy = element.cloneNode(true);
+
+        copy.id = null;
+        element.insertAdjacentElement('beforebegin', copy);
+
+        BookWyrm.addRemoveClass(copy, 'is-hidden', false);
+        setTimeout(function() {
+            copy.remove();
+        }, 10000, copy);
+    }
+
+    /**
+     * Success state for a posted status
+     *
+     * @param  {Object} the html form that was submitted
+     * @return {undefined}
+     */
+    submitStatusSuccess(form) {
+        // Clear form data
+        form.reset();
+
+        // Clear localstorage
+        form.querySelectorAll('[data-cache-draft]')
+            .forEach(node => window.localStorage.removeItem(node.dataset.cacheDraft));
+
+        // Close modals
+        let modal = form.closest(".modal.is-active");
+
+        if (modal) {
+            modal.getElementsByClassName("modal-close")[0].click();
+
+            // Update shelve buttons
+            document.querySelectorAll("[data-shelve-button-book='" + form.book.value +"']")
+                .forEach(button => this.cycleShelveButtons(button, form.reading_status.value));
+
+            return;
+        }
+
+        // Close reply panel
+        let reply = form.closest(".reply-panel");
+
+        if (reply) {
+            document.querySelector("[data-controls=" + reply.id + "]").click();
+        }
+
+        this.announceMessage('status-success-message');
+    }
+
+    /**
+     * Change which buttons are available for a shelf
+     *
+     * @param  {Object} html button dom element
+     * @param  {String} the identifier of the selected shelf
+     * @return {undefined}
+     */
+    cycleShelveButtons(button, identifier) {
+        // Pressed button
+        let shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']");
+        let next_identifier = shelf.dataset.shelfNext;
+
+        // Set all buttons to hidden
+        button.querySelectorAll("[data-shelf-identifier]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
+
+        // Button that should be visible now
+        let next = button.querySelector("[data-shelf-identifier=" + next_identifier + "]");
+
+        // Show the desired button
+        BookWyrm.addRemoveClass(next, "is-hidden", false);
+
+        // ------ update the dropdown buttons
+        // Remove existing hidden class
+        button.querySelectorAll("[data-shelf-dropdown-identifier]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", false));
+
+        // Remove existing disabled states
+        button.querySelectorAll("[data-shelf-dropdown-identifier] button")
+            .forEach(item => item.disabled = false);
+
+        next_identifier = next_identifier == 'complete' ? 'read' : next_identifier;
+
+        // Disable the current state
+        button.querySelector(
+            "[data-shelf-dropdown-identifier=" + identifier + "] button"
+        ).disabled = true;
+
+        let main_button = button.querySelector(
+            "[data-shelf-dropdown-identifier=" + next_identifier + "]"
+        );
+
+        // Hide the option that's shown as the main button
+        BookWyrm.addRemoveClass(main_button, "is-hidden", true);
+
+        // Just hide the other two menu options, idk what to do with them
+        button.querySelectorAll("[data-extra-options]")
+            .forEach(item => BookWyrm.addRemoveClass(item, "is-hidden", true));
+
+        // Close menu
+        let menu = button.querySelector(".dropdown-trigger[aria-expanded=true]");
+
+        if (menu) {
+            menu.click();
+        }
+    }
+
+    /**
+     * Reveal half-stars
+     *
+     * @param  {Event} event
+     * @return {undefined}
+     */
+    toggleStar(event) {
+        const label = event.currentTarget;
+        let wholeStar = document.getElementById(label.getAttribute("for"));
+
+        if (wholeStar.checked) {
+            event.preventDefault();
+            let halfStar = document.getElementById(label.dataset.forHalf);
+
+            wholeStar.checked = null;
+            halfStar.checked = "checked";
+        }
+    }
+}();
+
diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py
index 9c42d79d8..e8f236324 100644
--- a/bookwyrm/suggested_users.py
+++ b/bookwyrm/suggested_users.py
@@ -24,8 +24,8 @@ class SuggestedUsers(RedisStore):
     def store_id(self, user):  # pylint: disable=no-self-use
         """the key used to store this user's recs"""
         if isinstance(user, int):
-            return "{:d}-suggestions".format(user)
-        return "{:d}-suggestions".format(user.id)
+            return f"{user}-suggestions"
+        return f"{user.id}-suggestions"
 
     def get_counts_from_rank(self, rank):  # pylint: disable=no-self-use
         """calculate mutuals count and shared books count from rank"""
@@ -86,10 +86,12 @@ class SuggestedUsers(RedisStore):
         values = self.get_store(self.store_id(user), withscores=True)
         results = []
         # annotate users with mutuals and shared book counts
-        for user_id, rank in values[:5]:
+        for user_id, rank in values:
             counts = self.get_counts_from_rank(rank)
             try:
-                user = models.User.objects.get(id=user_id)
+                user = models.User.objects.get(
+                    id=user_id, is_active=True, bookwyrm_user=True
+                )
             except models.User.DoesNotExist as err:
                 # if this happens, the suggestions are janked way up
                 logger.exception(err)
@@ -97,6 +99,8 @@ class SuggestedUsers(RedisStore):
             user.mutuals = counts["mutuals"]
             # user.shared_books = counts["shared_books"]
             results.append(user)
+            if len(results) >= 5:
+                break
         return results
 
 
@@ -178,13 +182,21 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs):
 
 @receiver(signals.post_save, sender=models.User)
 # pylint: disable=unused-argument, too-many-arguments
-def add_new_user(sender, instance, created, update_fields=None, **kwargs):
-    """a new user, wow how cool"""
+def update_user(sender, instance, created, update_fields=None, **kwargs):
+    """an updated user, neat"""
     # a new user is found, create suggestions for them
     if created and instance.local:
         rerank_suggestions_task.delay(instance.id)
 
-    if update_fields and not "discoverable" in update_fields:
+    # we know what fields were updated and discoverability didn't change
+    if not instance.bookwyrm_user or (
+        update_fields and not "discoverable" in update_fields
+    ):
+        return
+
+    # deleted the user
+    if not created and not instance.is_active:
+        remove_user_task.delay(instance.id)
         return
 
     # this happens on every save, not just when discoverability changes, annoyingly
@@ -194,28 +206,61 @@ def add_new_user(sender, instance, created, update_fields=None, **kwargs):
         remove_user_task.delay(instance.id)
 
 
-@app.task
+@receiver(signals.post_save, sender=models.FederatedServer)
+def domain_level_update(sender, instance, created, update_fields=None, **kwargs):
+    """remove users on a domain block"""
+    if (
+        not update_fields
+        or "status" not in update_fields
+        or instance.application_type != "bookwyrm"
+    ):
+        return
+
+    if instance.status == "blocked":
+        bulk_remove_instance_task.delay(instance.id)
+        return
+    bulk_add_instance_task.delay(instance.id)
+
+
+# ------------------- TASKS
+
+
+@app.task(queue="low_priority")
 def rerank_suggestions_task(user_id):
     """do the hard work in celery"""
     suggested_users.rerank_user_suggestions(user_id)
 
 
-@app.task
+@app.task(queue="low_priority")
 def rerank_user_task(user_id, update_only=False):
     """do the hard work in celery"""
     user = models.User.objects.get(id=user_id)
     suggested_users.rerank_obj(user, update_only=update_only)
 
 
-@app.task
+@app.task(queue="low_priority")
 def remove_user_task(user_id):
     """do the hard work in celery"""
     user = models.User.objects.get(id=user_id)
     suggested_users.remove_object_from_related_stores(user)
 
 
-@app.task
+@app.task(queue="medium_priority")
 def remove_suggestion_task(user_id, suggested_user_id):
     """remove a specific user from a specific user's suggestions"""
     suggested_user = models.User.objects.get(id=suggested_user_id)
     suggested_users.remove_suggestion(user_id, suggested_user)
+
+
+@app.task(queue="low_priority")
+def bulk_remove_instance_task(instance_id):
+    """remove a bunch of users from recs"""
+    for user in models.User.objects.filter(federated_server__id=instance_id):
+        suggested_users.remove_object_from_related_stores(user)
+
+
+@app.task(queue="low_priority")
+def bulk_add_instance_task(instance_id):
+    """remove a bunch of users from recs"""
+    for user in models.User.objects.filter(federated_server__id=instance_id):
+        suggested_users.rerank_obj(user, update_only=False)
diff --git a/bookwyrm/tasks.py b/bookwyrm/tasks.py
index 6d1992a77..b860e0184 100644
--- a/bookwyrm/tasks.py
+++ b/bookwyrm/tasks.py
@@ -2,10 +2,10 @@
 import os
 from celery import Celery
 
-from bookwyrm import settings
+from celerywyrm import settings
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "celerywyrm.settings")
 app = Celery(
-    "tasks", broker=settings.CELERY_BROKER, backend=settings.CELERY_RESULT_BACKEND
+    "tasks", broker=settings.CELERY_BROKER_URL, backend=settings.CELERY_RESULT_BACKEND
 )
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index e504041bb..fc94c7de8 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -4,7 +4,6 @@
 {% load humanize %}
 {% load utilities %}
 {% load static %}
-{% load layout %}
 
 {% block title %}{{ book|book_title }}{% endblock %}
 
@@ -43,7 +42,7 @@
                 </p>
             {% endif %}
 
-            {% if book.authors %}
+            {% if book.authors.exists %}
                 <div class="subtitle">
                     {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
                 </div>
@@ -326,5 +325,5 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{% static "js/vendor/tabs.js" %}"></script>
+<script src="{% static "js/vendor/tabs.js" %}?v={{ js_cache }}"></script>
 {% endblock %}
diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index d8c1a4683..2eabd2e2b 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -14,7 +14,11 @@
             <h2 class="modal-card-title is-flex-shrink-1" id="modal_card_title_{{ controls_text }}_{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
-            {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
+            {% if static %}
+                <a href="/" class="delete">{{ label }}</a>
+            {% else %}
+                {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
+            {% endif %}
         </header>
         {% block modal-form-open %}{% endblock %}
         {% if not no_body %}
@@ -27,6 +31,10 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
+    {% if static %}
+        <a href="/" class="modal-close is-large">{{ label }}</a>
+    {% else %}
+        {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
+    {% endif %}
 </div>
 
diff --git a/bookwyrm/templates/components/tooltip.html b/bookwyrm/templates/components/tooltip.html
new file mode 100644
index 000000000..b1a8f56c1
--- /dev/null
+++ b/bookwyrm/templates/components/tooltip.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% trans "Help" as button_text %}
+{% include 'snippets/toggle/open_button.html' with text=button_text class="ml-3 is-rounded is-small is-white p-0 pb-1" icon="question-circle is-size-6" controls_text=controls_text controls_uid=controls_uid %}
+
+<aside class="tooltip notification is-hidden transition-y is-pulled-left mb-2" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
+    {% trans "Close" as button_text %}
+    {% include 'snippets/toggle/close_button.html' with label=button_text class="delete" nonbutton=True controls_text=controls_text controls_uid=controls_uid %}
+
+    {% block tooltip_content %}{% endblock %}
+</aside>
diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index e37ec170e..3a222cf6a 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -27,7 +27,7 @@
         {% if not draft %}
         {% include 'snippets/create_status.html' %}
         {% else %}
-        {% include 'snippets/create_status/status.html' %}
+        {% include 'snippets/create_status/status.html' with no_script=True %}
         {% endif %}
     </div>
 </div>
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/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 115e1e6f4..77f9aac19 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -14,7 +14,7 @@
 </header>
 
 <div class="box">
-    {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner %}
+    {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner no_script=True %}
 </div>
 
 <section class="block">
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 265a467a7..b8e351c9f 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -22,7 +22,7 @@
     {% blocktrans with tab_key=tab.key %}load <span data-poll="stream/{{ tab_key }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
-{% if request.user.show_goal and not goal and tab.key == streams.first.key %}
+{% if request.user.show_goal and not goal and tab.key == 'home' %}
 {% now 'Y' as year %}
 <section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
@@ -37,7 +37,7 @@
 <div class="block content">
     <p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>
 
-    {% if suggested_users %}
+    {% if request.user.show_suggested_users and suggested_users %}
     {# suggested users for when things are very lonely #}
     {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
     {% endif %}
@@ -46,7 +46,7 @@
 
 {% for activity in activities %}
 
-{% if not activities.number > 1 and forloop.counter0 == 2 and suggested_users %}
+{% if request.user.show_suggested_users and not activities.number > 1 and forloop.counter0 == 2 and suggested_users %}
 {# suggested users on the first page, two statuses down #}
 {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
 {% endif %}
diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html
index 746f4fd09..8d79781b3 100644
--- a/bookwyrm/templates/feed/layout.html
+++ b/bookwyrm/templates/feed/layout.html
@@ -106,5 +106,5 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="{% static "js/vendor/tabs.js" %}"></script>
+<script src="{% static "js/vendor/tabs.js" %}?v={{ js_cache }}"></script>
 {% endblock %}
diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html
index 1de1ae139..4e9f822b5 100644
--- a/bookwyrm/templates/feed/suggested_users.html
+++ b/bookwyrm/templates/feed/suggested_users.html
@@ -1,6 +1,15 @@
 {% load i18n %}
 <section class="block">
-    <h2 class="title is-5">{% trans "Who to follow" %}</h2>
+    <header class="columns">
+        <div class="column">
+            <h2 class="title is-5">{% trans "Who to follow" %}</h2>
+        </div>
+        <form class="column is-narrow" action="{% url 'hide-suggestions' %}" method="POST">
+            {% csrf_token %}
+            {% trans "Don't show suggested users" as button_text %}
+            <button type="submit" class="delete" title="{{ button_text }}">{{ button_text }}</button>
+        </form>
+    </header>
     {% include 'snippets/suggested_users.html' with suggested_users=suggested_users %}
     <a class="help" href="{% url 'directory' %}">{% trans "View directory" %} <span class="icon icon-arrow-right"></span></a>
 </section>
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import/import.html
similarity index 89%
rename from bookwyrm/templates/import.html
rename to bookwyrm/templates/import/import.html
index d2e407486..cc296b75b 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import/import.html
@@ -12,9 +12,14 @@
 
         <div class="columns">
         <div class="column is-half">
-            <label class="label" for="source">
-                {% trans "Data source:" %}
-            </label>
+
+            <div class="field">
+                <label class="label is-pulled-left" for="source">
+                    {% trans "Data source:" %}
+                </label>
+                {% include 'import/tooltip.html' with controls_text="goodreads-tooltip" %}
+            </div>
+
             <div class="select block">
                 <select name="source" id="source">
                     <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import/import_status.html
similarity index 97%
rename from bookwyrm/templates/import_status.html
rename to bookwyrm/templates/import/import_status.html
index db7330bb2..1c0739444 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import/import_status.html
@@ -40,7 +40,7 @@
 <div class="block">
     <h2 class="title is-4">{% trans "Failed to load" %}</h2>
     {% if not job.retry %}
-    <form name="retry" action="/import/{{ job.id }}" method="post">
+    <form name="retry" action="/import/{{ job.id }}" method="post" class="box">
         {% csrf_token %}
 
         {% with failed_count=failed_items|length %}
@@ -77,7 +77,7 @@
                     class="checkbox"
                     type="checkbox"
                     data-action="toggle-all"
-                    data-target="failed-imports"
+                    data-target="failed_imports"
                 />
                 {% trans "Select all" %}
             </label>
@@ -156,5 +156,5 @@
 {% endspaceless %}{% endblock %}
 
 {% block scripts %}
-<script src="{% static "js/check_all.js" %}"></script>
+<script src="{% static "js/check_all.js" %}?v={{ js_cache }}"></script>
 {% endblock %}
diff --git a/bookwyrm/templates/import/tooltip.html b/bookwyrm/templates/import/tooltip.html
new file mode 100644
index 000000000..1cfe5a3b2
--- /dev/null
+++ b/bookwyrm/templates/import/tooltip.html
@@ -0,0 +1,8 @@
+{% extends 'components/tooltip.html' %}
+{% load i18n %}
+
+{% block tooltip_content %}
+
+{% trans 'You can download your GoodReads data from the <a href="https://www.goodreads.com/review/import" target="_blank" rel="noopener">Import/Export page</a> of your GoodReads account.' %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/invite.html
index 22a3a32ca..fcd379e26 100644
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@@ -5,11 +5,11 @@
 
 {% block content %}
 
+<h1 class="title">{% trans "Create an Account" %}</h1>
 <div class="columns">
     <div class="column">
         <div class="block">
             {% if valid %}
-            <h1 class="title">{% trans "Create an Account" %}</h1>
             <div>
                 <form name="register" method="post" action="/register">
                     <input type=hidden name="invite_code" value="{{ invite.code }}">
@@ -25,7 +25,7 @@
         </div>
     </div>
     <div class="column">
-        <div class="block">
+        <div class="box">
             {% include 'snippets/about.html' %}
         </div>
     </div>
diff --git a/bookwyrm/templates/landing/about.html b/bookwyrm/templates/landing/about.html
index dd7036c4f..c3b1e84ef 100644
--- a/bookwyrm/templates/landing/about.html
+++ b/bookwyrm/templates/landing/about.html
@@ -1,4 +1,4 @@
-{% extends 'landing/landing_layout.html' %}
+{% extends 'landing/layout.html' %}
 {% load i18n %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html
index 7a30f1617..d13cd582a 100644
--- a/bookwyrm/templates/landing/landing.html
+++ b/bookwyrm/templates/landing/landing.html
@@ -1,4 +1,4 @@
-{% extends 'landing/landing_layout.html' %}
+{% extends 'landing/layout.html' %}
 {% load i18n %}
 {% block panel %}
 
diff --git a/bookwyrm/templates/landing/landing_layout.html b/bookwyrm/templates/landing/layout.html
similarity index 53%
rename from bookwyrm/templates/landing/landing_layout.html
rename to bookwyrm/templates/landing/layout.html
index 946482cbb..0d6f231c1 100644
--- a/bookwyrm/templates/landing/landing_layout.html
+++ b/bookwyrm/templates/landing/layout.html
@@ -40,38 +40,41 @@
     <div class="tile is-5 is-parent">
         {% if not request.user.is_authenticated %}
         <div class="tile is-child box has-background-primary-light content">
+            <h2 class="title">
+                {% if site.allow_registration %}
+                    {% blocktrans with name=site.name %}Join {{ name }}{% endblocktrans %}
+                {% elif site.allow_invite_requests %}
+                    {% trans "Request an Invitation" %}
+                {% else %}
+                    {% blocktrans with name=site.name%}{{ name}} registration is closed{% endblocktrans %}
+                {% endif %}
+            </h2>
+
             {% if site.allow_registration %}
-            <h2 class="title">{% blocktrans with name=site.name %}Join {{ name }}{% endblocktrans %}</h2>
-            <form name="register" method="post" action="/register">
-                {% include 'snippets/register_form.html' %}
-            </form>
-
+                <form name="register" method="post" action="/register">
+                    {% include 'snippets/register_form.html' %}
+                </form>
+            {% elif site.allow_invite_requests %}
+                {% if request_received %}
+                    <p>
+                        {% trans "Thank you! Your request has been received." %}
+                    </p>
+                {% else %}
+                    <p>{{ site.invite_request_text }}</p>
+                    <form name="invite-request" action="{% url 'invite-request' %}" method="post">
+                        {% csrf_token %}
+                        <div class="block">
+                            <label for="id_request_email" class="label">{% trans "Email address:" %}</label>
+                            <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email">
+                            {% for error in request_form.email.errors %}
+                            <p class="help is-danger">{{ error|escape }}</p>
+                            {% endfor %}
+                        </div>
+                        <button type="submit" class="button is-link">{% trans "Submit" %}</button>
+                    </form>
+                {% endif %}
             {% else %}
-
-            <h2 class="title">{% trans "This instance is closed" %}</h2>
-            <p>{{ site.registration_closed_text|safe}}</p>
-
-            {% if site.allow_invite_requests %}
-            {% if request_received %}
-            <p>
-                {% trans "Thank you! Your request has been received." %}
-            </p>
-            {% else %}
-            <h3>{% trans "Request an Invitation" %}</h3>
-            <form name="invite-request" action="{% url 'invite-request' %}" method="post">
-                {% csrf_token %}
-                <div class="block">
-                    <label for="id_request_email" class="label">{% trans "Email address:" %}</label>
-                    <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email">
-                    {% for error in request_form.email.errors %}
-                    <p class="help is-danger">{{ error|escape }}</p>
-                    {% endfor %}
-                </div>
-                <button type="submit" class="button is-link">{% trans "Submit" %}</button>
-            </form>
-            {% endif %}
-            {% endif %}
-
+                <p>{{ site.registration_closed_text|safe}}</p>
             {% endif %}
         </div>
         {% else %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 2b8364ec9..bf7a7f23e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -4,12 +4,14 @@
 <!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" %}">
     <link rel="stylesheet" href="{% static "css/bookwyrm.css" %}">
 
+    <link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch' %}" title="{% blocktrans with site_name=site.name %}{{ site_name }} search{% endblocktrans %}" />
+
     <link rel="shortcut icon" type="image/x-icon" href="{% if site.favicon %}{% get_media_prefix %}{{ site.favicon }}{% else %}{% static "images/favicon.ico" %}{% endif %}">
 
     {% if preview_images_enabled is True %}
@@ -17,8 +19,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 }}">
 
@@ -34,10 +36,15 @@
             <a class="navbar-item" href="/">
                 <img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="Home page">
             </a>
-            <form class="navbar-item column" action="/search/">
+            <form class="navbar-item column" action="{% url 'search' %}">
                 <div class="field has-addons">
                     <div class="control">
-                        <input aria-label="{% trans 'Search for a book or user' %}" id="search_input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
+                        {% if user.is_authenticated %}
+                            {% trans "Search for a book, user, or list" as search_placeholder %}
+                        {% else %}
+                            {% trans "Search for a book" as search_placeholder %}
+                        {% endif %}
+                        <input aria-label="{{ search_placeholder }}" id="search_input" class="input" type="text" name="q" placeholder="{{ search_placeholder }}" value="{{ query }}">
                     </div>
                     <div class="control">
                         <button class="button" type="submit">
@@ -109,19 +116,19 @@
                                 {% trans 'Settings' %}
                             </a>
                         </li>
-                        {% if perms.bookwyrm.create_invites or perms.moderate_users %}
+                        {% if perms.bookwyrm.create_invites or perms.moderate_user %}
                         <li class="navbar-divider" role="presentation"></li>
                         {% endif %}
-                        {% if perms.bookwyrm.create_invites %}
+                        {% if perms.bookwyrm.create_invites and not site.allow_registration %}
                         <li>
                             <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
                                 {% trans 'Invites' %}
                             </a>
                         </li>
                         {% endif %}
-                        {% if perms.bookwyrm.moderate_users %}
+                        {% if perms.bookwyrm.moderate_user %}
                         <li>
-                            <a href="{% url 'settings-users' %}" class="navbar-item">
+                            <a href="{% url 'settings-dashboard' %}" class="navbar-item">
                                 {% trans 'Admin' %}
                             </a>
                         </li>
@@ -210,6 +217,11 @@
     </div>
 </div>
 
+<div role="region" aria-live="polite" id="live-messages">
+    <p id="status-success-message" class="live-message is-sr-only is-hidden">{% trans "Successfully posted status" %}</p>
+    <p id="status-error-message" class="live-message notification is-danger p-3 pr-5 pl-5 is-hidden">{% trans "Error posting status" %}</p>
+</div>
+
 <footer class="footer">
     <div class="container">
         <div class="columns">
@@ -249,8 +261,11 @@
 <script>
     var csrf_token = '{{ csrf_token }}';
 </script>
-<script src="{% static "js/bookwyrm.js" %}"></script>
-<script src="{% static "js/localstorage.js" %}"></script>
+
+<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
+
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 661410e81..638d86b88 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -1,4 +1,4 @@
-{% extends 'lists/list_layout.html' %}
+{% extends 'lists/layout.html' %}
 {% load i18n %}
 {% block panel %}
 
diff --git a/bookwyrm/templates/lists/delete_list_modal.html b/bookwyrm/templates/lists/delete_list_modal.html
new file mode 100644
index 000000000..ee7a33935
--- /dev/null
+++ b/bookwyrm/templates/lists/delete_list_modal.html
@@ -0,0 +1,21 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}{% trans "Delete this list?" %}{% endblock %}
+
+{% block modal-body %}
+{% trans "This action cannot be un-done" %}
+{% endblock %}
+
+{% block modal-footer %}
+<form name="delete-list-{{ list.id }}" action="{% url 'delete-list' list.id %}" method="POST">
+    {% csrf_token %}
+    <input type="hidden" name="id" value="{{ list.id }}">
+    <button class="button is-danger" type="submit">
+        {% trans "Delete" %}
+    </button>
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete_list" controls_uid=list.id %}
+</form>
+{% endblock %}
+
diff --git a/bookwyrm/templates/lists/edit_form.html b/bookwyrm/templates/lists/edit_form.html
index 917e5e2aa..def47f063 100644
--- a/bookwyrm/templates/lists/edit_form.html
+++ b/bookwyrm/templates/lists/edit_form.html
@@ -9,4 +9,5 @@
 <form name="edit-list" method="post" action="{% url 'list' list.id %}">
     {% include 'lists/form.html' %}
 </form>
+{% include "lists/delete_list_modal.html" with controls_text="delete_list" controls_uid=list.id %}
 {% endblock %}
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index e5eb9c379..9a000d3f5 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -3,7 +3,7 @@
 <input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
-    <div class="column">
+    <div class="column is-two-thirds">
         <div class="field">
             <label class="label" for="id_name">{% trans "Name:" %}</label>
             {{ list_form.name }}
@@ -34,12 +34,21 @@
         </fieldset>
     </div>
 </div>
-<div class="field has-addons">
-    <div class="control">
-        {% include 'snippets/privacy_select.html' with current=list.privacy %}
+<div class="columns is-mobile">
+    <div class="column">
+        <div class="field has-addons">
+            <div class="control">
+                {% include 'snippets/privacy_select.html' with current=list.privacy %}
+            </div>
+            <div class="control">
+                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+            </div>
+        </div>
     </div>
-    <div class="control">
-        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+    {% if list.id %}
+    <div class="column is-narrow">
+        {% trans "Delete list" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_list" controls_uid=list.id focus="modal_title_delete_list" %}
     </div>
+    {% endif %}
 </div>
-
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/layout.html
similarity index 100%
rename from bookwyrm/templates/lists/list_layout.html
rename to bookwyrm/templates/lists/layout.html
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 37f7079bd..dbee2f1f5 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,4 +1,4 @@
-{% extends 'lists/list_layout.html' %}
+{% extends 'lists/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load markdown %}
@@ -66,14 +66,14 @@
                             <p>{% blocktrans with username=item.user.display_name user_path=item.user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
                             </div>
                         </div>
-                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
+                        {% if list.user == request.user %}
                         <div class="card-footer-item">
                             <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}">
+                                {% csrf_token %}
                                 <div class="field has-addons mb-0">
                                     <div class="control">
                                         <label for="input-list-position" class="button is-transparent is-small">{% trans "List position" %}</label>
                                     </div>
-                                    {% csrf_token %}
                                     <div class="control">
                                         <input id="input_list_position" class="input is-small" type="number" min="1" name="position" value="{{ item.order }}">
                                     </div>
@@ -83,7 +83,9 @@
                                 </div>
                             </form>
                         </div>
-                        <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
+                        {% endif %}
+                        {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
+                        <form name="remove-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
                             {% csrf_token %}
                             <input type="hidden" name="item" value="{{ item.id }}">
                             <button type="submit" class="button is-small is-danger">{% trans "Remove" %}</button>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 19c103eac..31e9cebb4 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -4,69 +4,65 @@
 {% block title %}{% trans "Login" %}{% endblock %}
 
 {% block content %}
-<div class="columns">
-    <div class="column">
-        <div class="box">
-            <h1 class="title">{% trans "Log in" %}</h1>
-            {% if login_form.non_field_errors %}
-            <p class="notification is-danger">{{ login_form.non_field_errors }}</p>
-            {% endif %}
+<h1 class="title">{% trans "Log in" %}</h1>
+<div class="columns is-multiline">
+    <div class="column is-half">
+        {% if login_form.non_field_errors %}
+        <p class="notification is-danger">{{ login_form.non_field_errors }}</p>
+        {% endif %}
 
-            {% if show_confirmed_email %}
-            <p class="notification is-success">{% trans "Success! Email address confirmed." %}</p>
-            {% endif %}
-            <form name="login" method="post" action="/login">
-                {% csrf_token %}
-                {% if show_confirmed_email %}<input type="hidden" name="first_login" value="true">{% endif %}
-                <div class="field">
-                    <label class="label" for="id_localname">{% trans "Username:" %}</label>
-                    <div class="control">
-                        {{ login_form.localname }}
-                    </div>
+        {% if show_confirmed_email %}
+        <p class="notification is-success">{% trans "Success! Email address confirmed." %}</p>
+        {% endif %}
+        <form name="login" method="post" action="/login">
+            {% csrf_token %}
+            {% if show_confirmed_email %}<input type="hidden" name="first_login" value="true">{% endif %}
+            <div class="field">
+                <label class="label" for="id_localname">{% trans "Username:" %}</label>
+                <div class="control">
+                    {{ login_form.localname }}
                 </div>
-                <div class="field">
-                    <label class="label" for="id_password">{% trans "Password:" %}</label>
-                    <div class="control">
-                        {{ login_form.password }}
-                    </div>
-                    {% for error in login_form.password.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
-                    {% endfor %}
+            </div>
+            <div class="field">
+                <label class="label" for="id_password">{% trans "Password:" %}</label>
+                <div class="control">
+                    {{ login_form.password }}
                 </div>
-                <div class="field is-grouped">
-                    <div class="control">
-                        <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
-                    </div>
-                    <div class="control">
-                        <small><a href="{% url 'password-reset' %}">{% trans "Forgot your password?" %}</a></small>
-                    </div>
+                {% for error in login_form.password.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+            <div class="field is-grouped">
+                <div class="control">
+                    <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
                 </div>
-            </form>
-        </div>
+                <div class="control">
+                    <small><a href="{% url 'password-reset' %}">{% trans "Forgot your password?" %}</a></small>
+                </div>
+            </div>
+        </form>
     </div>
 
-    <div class="column">
+    {% if site.allow_registration %}
+    <div class="column is-half">
         <div class="box has-background-primary-light">
-            {% if site.allow_registration %}
             <h2 class="title">{% trans "Create an Account" %}</h2>
             <form name="register" method="post" action="/register">
                 {% include 'snippets/register_form.html' %}
             </form>
-            {% else %}
-            <h2 class="title">{% trans "This instance is closed" %}</h2>
-            <p>{% trans "Contact an administrator to get an invite" %}</p>
-            {% endif %}
+        </div>
+    </div>
+    {% endif %}
+
+    <div class="column">
+        <div class="box">
+            {% include 'snippets/about.html' %}
+
+            <p class="block">
+            <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
+            </p>
         </div>
     </div>
 </div>
 
-<div class="block">
-    <div class="box">
-        {% include 'snippets/about.html' %}
-
-        <p class="block">
-        <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
-        </p>
-    </div>
-</div>
 {% endblock %}
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index db03850f8..d0e4026a7 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% load humanize %}
 
diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html
index 95a276af4..c83f626fa 100644
--- a/bookwyrm/templates/moderation/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 
 {% block title %}
diff --git a/bookwyrm/templates/opensearch.xml b/bookwyrm/templates/opensearch.xml
new file mode 100644
index 000000000..651958ab4
--- /dev/null
+++ b/bookwyrm/templates/opensearch.xml
@@ -0,0 +1,16 @@
+{% load i18n %}{% load static %}<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription
+    xmlns="http://a9.com/-/spec/opensearch/1.1/"
+    xmlns:moz="http://www.mozilla.org/2006/browser/search/"
+>
+    <ShortName>BW</ShortName>
+    <Description>{% blocktrans trimmed with site_name=site.name %}
+        {{ site_name }} search
+    {% endblocktrans %}</Description>
+    <Image width="16" height="16" type="image/x-icon">{{ image }}</Image>
+    <Url
+        type="text/html"
+        method="get"
+        template="https://{{ DOMAIN }}{% url 'search' %}?q={searchTerms}"
+    />
+</OpenSearchDescription>
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 6732b8ef6..4dc792f9b 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -43,9 +43,19 @@
     </div>
     <div class="block">
         <label class="checkbox label" for="id_show_goal">
-            {% trans "Show set reading goal prompt in feed:" %}
+            {% trans "Show reading goal prompt in feed:" %}
             {{ form.show_goal }}
         </label>
+        <label class="checkbox label" for="id_show_goal">
+            {% trans "Show suggested users:" %}
+            {{ form.show_suggested_users }}
+        </label>
+        <label class="checkbox label" for="id_discoverable">
+            {% trans "Show this account in suggested users:" %}
+            {{ form.discoverable }}
+        </label>
+        {% url 'directory' as path %}
+        <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
     </div>
     <div class="block">
         <label class="checkbox label" for="id_manually_approves_followers">
@@ -61,14 +71,6 @@
             {{ form.default_post_privacy }}
         </div>
     </div>
-    <div class="block">
-        <label class="checkbox label" for="id_discoverable">
-            {% trans "Show this account in suggested users:" %}
-            {{ form.discoverable }}
-        </label>
-        {% url 'directory' as path %}
-        <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
-    </div>
     <div class="block">
         <label class="label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
         <div class="select">
diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
index ca69128ec..501fb3c47 100644
--- a/bookwyrm/templates/reading_progress/finish.html
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -9,6 +9,6 @@ Finish "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True static=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index e24a0e05b..df8f698a6 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True static=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
index 6122ade3a..31f047cf8 100644
--- a/bookwyrm/templates/reading_progress/want.html
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -9,6 +9,6 @@ Want to Read "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %}
+{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True static=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index c0e5dec88..b3375bb50 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}{% load humanize %}
 {% block title %}{% trans "Announcement" %} - {{ announcement.preview }}{% endblock %}
 
diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html
index 8eb6acd52..ffdbfc2fd 100644
--- a/bookwyrm/templates/settings/announcement_form.html
+++ b/bookwyrm/templates/settings/announcement_form.html
@@ -13,21 +13,21 @@
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <p>
-    <label class="label" for="id_preview">Preview:</label>
+    <label class="label" for="id_preview">{% trans "Preview:" %}</label>
     {{ form.preview }}
     {% for error in form.preview.errors %}
     <p class="help is-danger">{{ error | escape }}</p>
     {% endfor %}
 </p>
 <p>
-    <label class="label" for="id_content">Content:</label>
+    <label class="label" for="id_content">{% trans "Content:" %}</label>
     {{ form.content }}
     {% for error in form.content.errors %}
     <p class="help is-danger">{{ error | escape }}</p>
     {% endfor %}
 </p>
 <p>
-    <label class="label" for="id_event_date">Event date:</label>
+    <label class="label" for="id_event_date">{% trans "Event date:" %}</label>
     <input type="date" name="event_date" value="{{ form.event_date.value|date:'Y-m-d' }}" class="input" id="id_event_date">
     {% for error in form.event_date.errors %}
     <p class="help is-danger">{{ error | escape }}</p>
@@ -37,7 +37,7 @@
 <div class="columns">
     <div class="column">
         <p>
-            <label class="label" for="id_start_date">Start date:</label>
+            <label class="label" for="id_start_date">{% trans "Start date:" %}</label>
             <input type="date" name="start_date" class="input" value="{{ form.start_date.value|date:'Y-m-d' }}" id="id_start_date">
             {% for error in form.start_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
@@ -46,7 +46,7 @@
     </div>
     <div class="column">
         <p>
-            <label class="label" for="id_end_date">End date:</label>
+            <label class="label" for="id_end_date">{% trans "End date:" %}</label>
             <input type="date" name="end_date" class="input" id="id_end_date" value="{{ form.end_date.value|date:'Y-m-d' }}">
             {% for error in form.end_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
@@ -55,7 +55,7 @@
     </div>
     <div class="column is-narrow">
         <p>
-            <label class="label" for="id_active">Active:</label>
+            <label class="label" for="id_active">{% trans "Active:" %}</label>
             {{ form.active }}
             {% for error in form.active.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index 18e765317..2c57ae787 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}{% load humanize %}
 {% block title %}{% trans "Announcements" %}{% endblock %}
 
@@ -14,40 +14,46 @@
     {% include 'settings/announcement_form.html' with controls_text="create_announcement" %}
 </form>
 
-<table class="table is-striped">
-    <tr>
-        <th>
-            {% url 'settings-announcements' as url %}
-            {% trans "Date added" as text %}
-            {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
-        </th>
-        <th>
-            {% trans "Preview" as text %}
-            {% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
-        </th>
-        <th>
-            {% trans "Start date" as text %}
-            {% include 'snippets/table-sort-header.html' with field="start_date" sort=sort text=text %}
-        </th>
-        <th>
-            {% trans "End date" as text %}
-            {% include 'snippets/table-sort-header.html' with field="end_date" sort=sort text=text %}
-        </th>
-        <th>
-            {% trans "Status" as text %}
-            {% include 'snippets/table-sort-header.html' with field="active" sort=sort text=text %}
-        </th>
-    </tr>
-    {% for announcement in announcements %}
-    <tr>
-        <td>{{ announcement.created_date|naturalday }}</td>
-        <td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.preview }}</a></td>
-        <td>{{ announcement.start_date|naturaltime|default:'' }}</td>
-        <td>{{ announcement.end_date|naturaltime|default:'' }}</td>
-        <td>{% if announcement.active %}{% trans "active" %}{% else %}{% trans "inactive" %}{% endif %}</td>
-    </tr>
-    {% endfor %}
-</table>
+<div class="block">
+    <table class="table is-striped">
+        <tr>
+            <th>
+                {% url 'settings-announcements' as url %}
+                {% trans "Date added" as text %}
+                {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
+            </th>
+            <th>
+                {% trans "Preview" as text %}
+                {% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
+            </th>
+            <th>
+                {% trans "Start date" as text %}
+                {% include 'snippets/table-sort-header.html' with field="start_date" sort=sort text=text %}
+            </th>
+            <th>
+                {% trans "End date" as text %}
+                {% include 'snippets/table-sort-header.html' with field="end_date" sort=sort text=text %}
+            </th>
+            <th>
+                {% trans "Status" as text %}
+                {% include 'snippets/table-sort-header.html' with field="active" sort=sort text=text %}
+            </th>
+        </tr>
+        {% for announcement in announcements %}
+        <tr>
+            <td>{{ announcement.created_date|naturalday }}</td>
+            <td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.preview }}</a></td>
+            <td>{{ announcement.start_date|naturaltime|default:'' }}</td>
+            <td>{{ announcement.end_date|naturaltime|default:'' }}</td>
+            <td>{% if announcement.active %}{% trans "active" %}{% else %}{% trans "inactive" %}{% endif %}</td>
+        </tr>
+        {% endfor %}
+    </table>
+
+    {% if not announcements %}
+    <p><em>{% trans "No announcements found." %}</em></p>
+    {% endif %}
+</div>
 
 {% include 'snippets/pagination.html' with page=announcements path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/templates/settings/dashboard.html b/bookwyrm/templates/settings/dashboard.html
new file mode 100644
index 000000000..608d32c97
--- /dev/null
+++ b/bookwyrm/templates/settings/dashboard.html
@@ -0,0 +1,120 @@
+{% extends 'settings/layout.html' %}
+{% load i18n %}
+{% load humanize %}
+{% load static %}
+
+{% block title %}{% trans "Dashboard" %}{% endblock %}
+
+{% block header %}{% trans "Dashboard" %}{% endblock %}
+
+{% block panel %}
+
+<div class="columns block has-text-centered">
+    <div class="column is-3">
+        <div class="notification">
+            <h3>{% trans "Total users" %}</h3>
+            <p class="title is-5">{{ users|intcomma }}</p>
+        </div>
+    </div>
+    <div class="column is-3">
+        <div class="notification">
+            <h3>{% trans "Active this month" %}</h3>
+            <p class="title is-5">{{ active_users|intcomma }}</p>
+        </div>
+    </div>
+    <div class="column is-3">
+        <div class="notification">
+            <h3>{% trans "Statuses" %}</h3>
+            <p class="title is-5">{{ statuses|intcomma }}</p>
+        </div>
+    </div>
+    <div class="column is-3">
+        <div class="notification">
+            <h3>{% trans "Works" %}</h3>
+            <p class="title is-5">{{ works|intcomma }}</p>
+        </div>
+    </div>
+</div>
+
+<div class="columns block is-multiline">
+    {% if reports %}
+    <div class="column">
+        <a href="{% url 'settings-reports' %}" class="notification is-warning is-block">
+            {% blocktrans trimmed count counter=reports with display_count=reports|intcomma %}
+            {{ display_count }} open report
+            {% plural %}
+            {{ display_count }} open reports
+            {% endblocktrans %}
+        </a>
+    </div>
+    {% endif %}
+    {% if not site.allow_registration and site.allow_invite_requests and invite_requests %}
+    <div class="column">
+        <a href="{% url 'settings-invite-requests' %}" class="notification is-block is-success is-light">
+            {% blocktrans trimmed count counter=invite_requests with display_count=invite_requests|intcomma %}
+            {{ display_count }} invite request
+            {% plural %}
+            {{ display_count }} invite requests
+            {% endblocktrans %}
+        </a>
+    </div>
+    {% endif %}
+</div>
+
+<div class="block content">
+    <h2>{% trans "Instance Activity" %}</h2>
+
+    <form method="get" action="{% url 'settings-dashboard' %}" class="notification has-background-white-bis">
+        <div class="is-flex is-align-items-flex-end">
+            <div class="ml-1 mr-1">
+                <label class="label">
+                    {% trans "Start date:" %}
+                    <input class="input" type="date" name="start" value="{{ start }}">
+                </label>
+            </div>
+            <div class="ml-1 mr-1">
+                <label class="label">
+                    {% trans "End date:" %}
+                    <input class="input" type="date" name="end" value="{{ end }}">
+                </label>
+            </div>
+            <div class="ml-1 mr-1">
+                <label class="label">
+                    {% trans "Interval:" %}
+                    <div class="select">
+                        <select name="days">
+                            <option value="1" {% if interval == 1 %}selected{% endif %}>{% trans "Days" %}</option>
+                            <option value="7" {% if interval == 7 %}selected{% endif %}>{% trans "Weeks" %}</option>
+                        </select>
+                    </div>
+                </label>
+            </div>
+            <div class="ml-1 mr-1">
+                <button class="button is-link" type="submit">{% trans "Submit" %}</button>
+            </div>
+        </div>
+    </form>
+
+    <div class="columns">
+        <div class="column">
+            <h3>{% trans "User signup activity" %}</h3>
+            <div class="box">
+                <canvas id="user_stats"></canvas>
+            </div>
+        </div>
+        <div class="column">
+            <h3>{% trans "Status activity" %}</h3>
+            <div class="box">
+                <canvas id="status_stats"></canvas>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block scripts %}
+<script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
+{% include 'settings/dashboard_user_chart.html' %}
+{% include 'settings/dashboard_status_chart.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/settings/dashboard_status_chart.html b/bookwyrm/templates/settings/dashboard_status_chart.html
new file mode 100644
index 000000000..bbacf3f46
--- /dev/null
+++ b/bookwyrm/templates/settings/dashboard_status_chart.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+<script>
+const status_labels = [{% for label in status_stats.labels %}"{{ label }}",{% endfor %}];
+const status_data = {
+    labels: status_labels,
+    datasets: [{
+        label: '{% trans "Statuses posted" %}',
+        backgroundColor: 'rgb(255, 99, 132)',
+        borderColor: 'rgb(255, 99, 132)',
+        data: {{ status_stats.total }},
+    }]
+};
+// === include 'setup' then 'config' above ===
+
+const status_config = {
+    type: 'bar',
+    data: status_data,
+    options: {}
+};
+
+var statusStats = new Chart(
+    document.getElementById('status_stats'),
+    status_config
+);
+</script>
+
diff --git a/bookwyrm/templates/settings/dashboard_user_chart.html b/bookwyrm/templates/settings/dashboard_user_chart.html
new file mode 100644
index 000000000..33be28f7e
--- /dev/null
+++ b/bookwyrm/templates/settings/dashboard_user_chart.html
@@ -0,0 +1,29 @@
+{% load i18n %}
+<script>
+const labels = [{% for label in user_stats.labels %}"{{ label }}",{% endfor %}];
+const data = {
+    labels: labels,
+    datasets: [{
+        label: '{% trans "Total" %}',
+        backgroundColor: 'rgb(255, 99, 132)',
+        borderColor: 'rgb(255, 99, 132)',
+        data: {{ user_stats.total }},
+    }, {
+        label: '{% trans "Active this month" %}',
+        backgroundColor: 'rgb(75, 192, 192)',
+        borderColor: 'rgb(75, 192, 192)',
+        data: {{ user_stats.active }},
+    }]
+};
+
+const config = {
+    type: 'line',
+    data: data,
+    options: {}
+};
+
+var userStats = new Chart(
+    document.getElementById('user_stats'),
+    config
+);
+</script>
diff --git a/bookwyrm/templates/settings/domain_form.html b/bookwyrm/templates/settings/domain_form.html
new file mode 100644
index 000000000..e93337495
--- /dev/null
+++ b/bookwyrm/templates/settings/domain_form.html
@@ -0,0 +1,30 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Add domain" %}
+{% endblock %}
+
+{% block form %}
+<form name="add-domain" method="post" action="{% url 'settings-email-blocks' %}">
+    {% csrf_token %}
+    <label class="label" for="id_domain">{% trans "Domain:" %}</label>
+    <div class="field has-addons">
+        <div class="control">
+            <div class="button is-disabled">@</div>
+        </div>
+        <div class="control">
+            {{ form.domain }}
+        </div>
+    </div>
+    {% for error in form.domain.errors %}
+    <p class="help is-danger">{{ error | escape }}</p>
+    {% endfor %}
+
+    <div class="field">
+        <div class="control">
+            <button type="submit" class="button is-primary">{% trans "Add" %}</button>
+        </div>
+    </div>
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index 55346a526..452316e43 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% block title %}{% trans "Add instance" %}{% endblock %}
 
diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html
new file mode 100644
index 000000000..ea63b954e
--- /dev/null
+++ b/bookwyrm/templates/settings/email_blocklist.html
@@ -0,0 +1,61 @@
+{% extends 'settings/layout.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block title %}{% trans "Email Blocklist" %}{% endblock %}
+
+{% block header %}{% trans "Email Blocklist" %}{% endblock %}
+
+{% block edit-button %}
+{% trans "Add domain" as button_text %}
+{% include 'snippets/toggle/open_button.html' with controls_text="add_domain" icon_with_text="plus" text=button_text focus="add_domain_header" %}
+{% endblock %}
+
+{% block panel %}
+{% include 'settings/domain_form.html' with controls_text="add_domain" class="block" %}
+
+<p class="notification block">
+    {% trans "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked." %}
+</p>
+
+<table class="table is-striped is-fullwidth">
+    <tr>
+        {% url 'settings-federation' as url %}
+        <th>
+            {% trans "Domain" %}
+        </th>
+        <th>{% trans "Users" %}</th>
+        <th>
+            {% trans "Options" %}
+        </th>
+    </tr>
+    {% for domain in domains %}
+    <tr>
+        <td>{{ domain.domain }}</td>
+        <td>
+            <a href="{% url 'settings-users' %}?email=@{{ domain.domain }}">
+            {% with user_count=domain.users.count %}
+                {% blocktrans trimmed count conter=user_count with display_count=user_count|intcomma %}
+                {{ display_count }} user
+                {% plural %}
+                {{ display_count }} users
+                {% endblocktrans %}
+            {% endwith %}
+            </a>
+        </td>
+        <td>
+            <form name="remove-{{ domain.id }}" action="{% url 'settings-email-blocks-delete' domain.id %}" method="post">
+                {% csrf_token %}
+                {% trans "Delete" as button_text %}
+                <button class="button" type="submit">
+                    <span class="icon icon-x" title="{{ button_text }}" aria-hidden="true"></span>
+                    <span class="is-hidden-mobile">{{ button_text }}</span>
+                </button>
+            </form>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index c47dd285c..6a1a5488c 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% load markdown %}
 
@@ -29,7 +29,7 @@
                 </div>
                 <div class="is-flex">
                     <dt>{% trans "Status:" %}</dt>
-                    <dd>{{ server.status }}</dd>
+                    <dd>{{ server.get_status_display }}</dd>
                 </div>
             </dl>
         </div>
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index e0a9ba73a..ffbabca35 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% block title %}{% trans "Federated Instances" %}{% endblock %}
 
@@ -12,6 +12,19 @@
 {% endblock %}
 
 {% block panel %}
+<div class="tabs">
+    <ul>
+        {% url 'settings-federation' status='federated' as url %}
+        <li {% if request.path in url %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Federated" %}</a>
+        </li>
+        {% url 'settings-federation' status='blocked' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Blocked" %}</a>
+        </li>
+    </ul>
+</div>
+
 <table class="table is-striped">
     <tr>
         {% url 'settings-federation' as url %}
@@ -20,21 +33,30 @@
             {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %}
         </th>
         <th>
-            {% trans "Date federated" as text %}
+            {% trans "Date added" as text %}
             {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
         </th>
         <th>
             {% trans "Software" as text %}
             {% include 'snippets/table-sort-header.html' with field="application_type" sort=sort text=text %}
         </th>
+        <th>
+            {% trans "Users" %}
+        </th>
         <th>{% trans "Status" %}</th>
     </tr>
     {% for server in servers %}
     <tr>
         <td><a href="{% url 'settings-federated-server' server.id %}">{{ server.server_name }}</a></td>
         <td>{{ server.created_date }}</td>
-        <td>{{ server.application_type }} ({{ server.application_version }})</td>
-        <td>{{ server.status }}</td>
+        <td>
+        {% if server.application_type %}
+            {{ server.application_type }}
+            {% if server.application_version %}({{ server.application_version }}){% endif %}
+        {% endif %}
+        </td>
+        <td>{{ server.user_set.count }}</td>
+        <td>{{ server.get_status_display }}</td>
     </tr>
     {% endfor %}
 </table>
diff --git a/bookwyrm/templates/settings/ip_address_form.html b/bookwyrm/templates/settings/ip_address_form.html
new file mode 100644
index 000000000..c8a4c3e74
--- /dev/null
+++ b/bookwyrm/templates/settings/ip_address_form.html
@@ -0,0 +1,36 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Add IP address" %}
+{% endblock %}
+
+{% block form %}
+<form name="add-address" method="post" action="{% url 'settings-ip-blocks' %}">
+    <div class="block">
+        {% trans "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page." %}
+    </div>
+
+    {% csrf_token %}
+
+    <div class="field">
+        <label class="label" for="id_address">
+            {% trans "IP Address:" %}
+        </label>
+    </div>
+
+    <div class="field">
+        <input type="text" name="address" maxlength="255" class="input" required="" id="id_address" placeholder="190.0.2.0/24">
+    </div>
+
+    {% for error in form.address.errors %}
+    <p class="help is-danger">{{ error | escape }}</p>
+    {% endfor %}
+
+    <div class="field">
+        <div class="control">
+            <button type="submit" class="button is-primary">{% trans "Add" %}</button>
+        </div>
+    </div>
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/ip_blocklist.html b/bookwyrm/templates/settings/ip_blocklist.html
new file mode 100644
index 000000000..c978c1265
--- /dev/null
+++ b/bookwyrm/templates/settings/ip_blocklist.html
@@ -0,0 +1,47 @@
+{% extends 'settings/layout.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block title %}{% trans "IP Address Blocklist" %}{% endblock %}
+
+{% block header %}{% trans "IP Address Blocklist" %}{% endblock %}
+
+{% block edit-button %}
+{% trans "Add IP address" as button_text %}
+{% include 'snippets/toggle/open_button.html' with controls_text="add_address" icon_with_text="plus" text=button_text focus="add_address_header" %}
+{% endblock %}
+
+{% block panel %}
+{% include 'settings/ip_address_form.html' with controls_text="add_address" class="block" %}
+
+<p class="notification block">
+    {% trans "Any traffic from this IP address will get a 404 response when trying to access any part of the application." %}
+</p>
+
+<table class="table is-striped is-fullwidth">
+    <tr>
+        <th>
+            {% trans "Address" %}
+        </th>
+        <th>
+            {% trans "Options" %}
+        </th>
+    </tr>
+    {% for address in addresses %}
+    <tr>
+        <td>{{ address.address }}</td>
+        <td>
+            <form name="remove-{{ address.id }}" action="{% url 'settings-ip-blocks-delete' address.id %}" method="post">
+                {% csrf_token %}
+                {% trans "Delete" as button_text %}
+                <button class="button" type="submit">
+                    <span class="icon icon-x" title="{{ button_text }}" aria-hidden="true"></span>
+                    <span class="is-hidden-mobile">{{ button_text }}</span>
+                </button>
+            </form>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/ip_tooltip.html b/bookwyrm/templates/settings/ip_tooltip.html
new file mode 100644
index 000000000..3a2bf543a
--- /dev/null
+++ b/bookwyrm/templates/settings/ip_tooltip.html
@@ -0,0 +1,8 @@
+{% extends 'components/tooltip.html' %}
+{% load i18n %}
+
+{% block tooltip_content %}
+
+{% trans "You can block IP ranges using CIDR syntax." %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/layout.html
similarity index 73%
rename from bookwyrm/templates/settings/admin_layout.html
rename to bookwyrm/templates/settings/layout.html
index 9e57076bf..dd315347d 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/layout.html
@@ -18,25 +18,49 @@
 
 <div class="block columns">
     <nav class="menu column is-one-quarter">
+        <h2 class="menu-label">
+            {% url 'settings-dashboard' as url %}
+            <a
+                href="{{ url }}"
+                {% if url in request.path %} class="is-active" aria-selected="true"{% endif %}
+            >{% trans "Dashboard" %}</a>
+        </h2>
         {% if perms.bookwyrm.create_invites %}
         <h2 class="menu-label">{% trans "Manage Users" %}</h2>
         <ul class="menu-list">
+            {% if perms.bookwyrm.moderate_user %}
             <li>
                 {% url 'settings-users' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Users" %}</a>
             </li>
+            {% endif %}
             <li>
                 {% url 'settings-invite-requests' as url %}
                 {% url 'settings-invites' as alt_url %}
                 <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
+            {% if perms.bookwyrm.control_federation %}
+            <li>
+                {% url 'settings-federation' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a>
+            </li>
+            {% endif %}
+        </ul>
+        {% endif %}
+        {% if perms.bookwyrm.moderate_user %}
+        <h2 class="menu-label">{% trans "Moderation" %}</h2>
+        <ul class="menu-list">
             <li>
                 {% url 'settings-reports' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
             </li>
             <li>
-                {% url 'settings-federation' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a>
+                {% url 'settings-email-blocks' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Email Blocklist" %}</a>
+            </li>
+            <li>
+                {% url 'settings-ip-blocks' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "IP Address Blocklist" %}</a>
             </li>
         </ul>
         {% endif %}
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 5b7315f98..e0cfd6469 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% load humanize %}
 {% block header %}{% trans "Invite Requests" %}{% endblock %}
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 6efaefcf2..95b8bdf00 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% block header %}{% trans "Invites" %}{% endblock %}
 {% load humanize %}
diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html
index 49334982f..926ab5f4a 100644
--- a/bookwyrm/templates/settings/server_blocklist.html
+++ b/bookwyrm/templates/settings/server_blocklist.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% block title %}{% trans "Add instance" %}{% endblock %}
 
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 05b504a97..508954857 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Site Settings" %}{% endblock %}
@@ -23,6 +23,11 @@
             <label class="label" for="id_instance_description">{% trans "Instance description:" %}</label>
             {{ site_form.instance_description }}
         </div>
+        <div class="field">
+            <label class="label mb-0" for="id_short_description">{% trans "Short description:" %}</label>
+            <p class="help">{% trans "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown." %}</p>
+            {{ site_form.instance_short_description }}
+        </div>
         <div class="field">
             <label class="label" for="id_code_of_conduct">{% trans "Code of conduct:" %}</label>
             {{ site_form.code_of_conduct }}
@@ -102,6 +107,13 @@
             <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
             {{ site_form.registration_closed_text }}
         </div>
+        <div class="field">
+            <label class="label" for="id_invite_request_text">{% trans "Invite request text:" %}</label>
+            {{ site_form.invite_request_text }}
+            {% for error in site_form.invite_request_text.errors %}
+            <p class="help is-danger">{{ error|escape }}</p>
+            {% endfor %}
+        </div>
     </section>
 
     <footer class="block">
diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html
index b94777d1c..c9a9db80e 100644
--- a/bookwyrm/templates/snippets/about.html
+++ b/bookwyrm/templates/snippets/about.html
@@ -3,7 +3,7 @@
 <div class="columns">
     <div class="column is-narrow is-hidden-mobile">
         <figure class="block is-w-xl">
-            <img src="{% if site.logo %}/images/{{ site.logo }}{% else %}{% static "images/logo.png" %}{% endif %}" alt="BookWyrm logo">
+            <img src="{% if site.logo %}{% get_media_prefix %}{{ site.logo }}{% else %}{% static "images/logo.png" %}{% endif %}" alt="BookWyrm logo">
         </figure>
     </div>
     <div class="content">
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index 5eddabff7..1c2bb176d 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -2,7 +2,7 @@
 {% load utilities %}
 {% spaceless %}
 
-{% if book.authors %}
+{% if book.authors.exists %}
 {% blocktrans trimmed with path=book.local_path title=book|book_title %}
 <a href="{{ path }}">{{ title }}</a> by
 {% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html
index d830ddcbf..4bf1fc243 100644
--- a/bookwyrm/templates/snippets/create_status/comment.html
+++ b/bookwyrm/templates/snippets/create_status/comment.html
@@ -26,13 +26,37 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
             <label class="label" for="progress_{{ uuid }}">{% trans "Progress:" %}</label>
             <div class="field has-addons mb-0">
                 <div class="control">
-                    <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress_{{ uuid }}">
+                    <input
+                        aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+                        class="input"
+                        type="number"
+                        min="0"
+                        name="progress"
+                        size="3"
+                        value="{% firstof draft.progress readthrough.progress '' %}"
+                        id="progress_{{ uuid }}"
+                        data-cache-draft="id_progress_comment_{{ book.id }}"
+                    >
                 </div>
                 <div class="control">
                     <div class="select">
-                        <select name="progress_mode" aria-label="Progress mode">
-                            <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                            <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                        <select
+                            name="progress_mode"
+                            aria-label="Progress mode"
+                            data-cache-draft="id_progress_mode_comment_{{ book.id }}"
+                        >
+                            <option
+                                value="PG"
+                                {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}
+                            >
+                                {% trans "pages" %}
+                            </option>
+                            <option
+                                value="PCT"
+                                {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}
+                            >
+                                {% trans "percent" %}
+                            </option>
                         </select>
                     </div>
                 </div>
diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index 903372003..c2b383b9a 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -10,10 +10,11 @@ draft: an existing Status object that is providing default values for input fiel
 {% endcomment %}
 <textarea
     name="content"
-    class="textarea"
+    class="textarea save-draft"
+    data-cache-draft="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
-    {% if not optional and type != "quotation" %}required{% endif %}
+    {% if not optional and type != "quotation" and type != "review" %}required{% endif %}
 >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
 
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
index de637bcc6..ab96c72e3 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -1,12 +1,22 @@
 {% load i18n %}
-<div class="control{% if not parent_status.content_warning and not draft.content_warning %} is-hidden{% endif %}" id="spoilers_{{ uuid }}">
-    <label class="is-sr-only" for="id_content_warning_{{ uuid }}">{% trans "Spoiler alert:" %}</label>
+<div
+    class="field{% if not reply_parent.content_warning and not draft.content_warning %} is-hidden{% endif %}"
+    id="spoilers_{{ uuid }}{{ local_uuid }}"
+>
+    <label
+        class="label"
+        for="id_content_warning_{{ uuid }}{{ local_uuid }}"
+    >
+        {% trans "Content warning:" %}
+    </label>
     <input
         type="text"
         name="content_warning"
         maxlength="255"
         class="input"
-        id="id_content_warning_{{ uuid }}"
+        id="id_content_warning_{{ uuid }}{{ local_uuid }}"
         placeholder="{% trans 'Spoilers ahead!' %}"
-        value="{% firstof draft.content_warning parent_status.content_warning '' %}">
+        value="{% firstof draft.content_warning reply_parent.content_warning '' %}"
+        data-cache-draft="id_content_warning_{{ book.id }}_{{ type }}"
+    >
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
index 40668a424..f29d47c45 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
@@ -1,8 +1,17 @@
 {% load i18n %}
 
 <div class="control">
-    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers_{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+    <input
+        type="checkbox"
+        class="is-hidden"
+        name="sensitive"
+        id="id_show_spoilers_{{ uuid }}{{ local_uuid }}"
+        {% if draft.content_warning or status.content_warning %}checked{% endif %}
+        aria-hidden="true"
+        data-cache-draft="id_sensitive_{{ book.id }}_{{ type }}{{ reply_parent.id }}"
+    >
     {% trans "Include spoiler alert" as button_text %}
     {% firstof draft.content_warning status.content_warning as pressed %}
-    {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
+    {% firstof local_uuid '' as local_uuid %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid|add:local_uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html
index 5b435f276..1e10085c0 100644
--- a/bookwyrm/templates/snippets/create_status/layout.html
+++ b/bookwyrm/templates/snippets/create_status/layout.html
@@ -14,7 +14,13 @@ reply_parent: the Status object this post will be in reply to, if applicable
 
 {% block form_open %}
 {# default form tag syntax, can be overriddden #}
-<form class="is-flex-grow-1" name="{{ type }}" action="/post/{{ type }}" method="post" id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+<form
+    class="is-flex-grow-1{% if not no_script %} submit-status{% endif %}"
+    name="{{ type }}"
+    action="/post/{{ type }}"
+    method="post"
+    id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
+>
 {% endblock %}
 
     {% csrf_token %}
@@ -25,23 +31,19 @@ reply_parent: the Status object this post will be in reply to, if applicable
     <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
     {% endblock %}
 
+    {% include "snippets/create_status/content_warning_field.html" %}
+
+    {# fields that go between the content warnings and the content field (ie, quote) #}
+    {% block pre_content_additions %}{% endblock %}
+
+    <label class="label" for="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+        {% block content_label %}
+            {% trans "Comment:" %}
+        {% endblock %}
+    </label>
+
     <div class="field">
-        <div class="control">
-            {% include "snippets/create_status/content_warning_field.html" %}
-        </div>
-
-        {# fields that go between the content warnings and the content field (ie, quote) #}
-        {% block pre_content_additions %}{% endblock %}
-
-        <label class="label" for="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
-            {% block content_label %}
-                {% trans "Comment:" %}
-            {% endblock %}
-        </label>
-
-        <div class="control">
-            {% include "snippets/create_status/content_field.html" with placeholder=placeholder %}
-        </div>
+        {% include "snippets/create_status/content_field.html" with placeholder=placeholder %}
     </div>
 
     {# additional fields that go after the content block (ie, progress) #}
diff --git a/bookwyrm/templates/snippets/create_status/post_options_block.html b/bookwyrm/templates/snippets/create_status/post_options_block.html
index 6cfb0c5c0..697614e19 100644
--- a/bookwyrm/templates/snippets/create_status/post_options_block.html
+++ b/bookwyrm/templates/snippets/create_status/post_options_block.html
@@ -16,7 +16,10 @@
         </div>
     </div>
     <div class="column is-narrow">
-        <button class="button is-link" type="submit">{% trans "Post" %}</button>
+        <button class="button is-link" type="submit">
+            <span class="icon icon-spinner" aria-hidden="true"></span>
+            <span>{% trans "Post" %}</span>
+        </button>
     </div>
 </div>
 
diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html
index 03e9c25b3..25f3199bf 100644
--- a/bookwyrm/templates/snippets/create_status/quotation.html
+++ b/bookwyrm/templates/snippets/create_status/quotation.html
@@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and
 uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
 {% endcomment %}
 
-{% with type="quotation" %}
-
 {% block pre_content_additions %}
     <div class="field">
         <label class="label" for="id_quote_{{ book.id }}_{{ type }}">
@@ -26,9 +24,48 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
                 id="id_quote_{{ book.id }}_{{ type }}"
                 placeholder="{% blocktrans with book_title=book.title %}An excerpt from '{{ book_title }}'{% endblocktrans %}"
                 required
+                data-cache-draft="id_quote_{{ book.id }}_{{ type }}"
             >{{ draft.quote|default:'' }}</textarea>
         </div>
     </div>
+    <div class="field">
+        <label class="label" for="position_{{ uuid }}">{% trans "Position:" %}</label>
+        <div class="field has-addons mb-0">
+            <div class="control">
+                <div class="select">
+                    <select
+                        name="position_mode"
+                        aria-label="Position mode"
+                        data-cache-draft="id_position_mode_{{ book.id }}_{{ type }}"
+                    >
+                        <option
+                            value="PG"
+                            {% if draft.position_mode == 'PG' or not draft %}selected{% endif %}
+                        >
+                            {% trans "On page:" %}
+                        </option>
+                        <option
+                            value="PCT"
+                            {% if draft.position_mode == 'PCT' %}selected{% endif %}
+                        >
+                            {% trans "At percent:" %}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div class="control">
+                <input
+                    aria-label="{% if draft.position_mode == 'PG' %}Page{% else %}Percent{% endif %}"
+                    class="input"
+                    type="number"
+                    min="0"
+                    name="position"
+                    size="3"
+                    value="{% firstof draft.position '' %}"
+                    id="position_{{ uuid }}"
+                    data-cache-draft="id_position_{{ book.id }}_{{ type }}"
+                >
+            </div>
+        </div>
+    </div>
 {% endblock %}
-
-{% endwith %}
diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html
index be17b7f2e..67214f332 100644
--- a/bookwyrm/templates/snippets/create_status/review.html
+++ b/bookwyrm/templates/snippets/create_status/review.html
@@ -11,13 +11,21 @@ draft: the content of an existing Status object to be edited (used in delete and
 uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls
 {% endcomment %}
 
-{% with type="review" %}
-
 {% block pre_content_additions %}
     <div class="field">
         <label class="label" for="id_name_{{ book.id }}">{% trans "Title:" %}</label>
         <div class="control">
-            <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}" placeholder="{% blocktrans with book_title=book.title %}Your review of '{{ book_title }}'{% endblocktrans %}" value="{% firstof draft.name ''%}">
+            <input
+                type="text"
+                name="name"
+                maxlength="255"
+                class="input"
+                required=""
+                id="id_name_{{ book.id }}"
+                placeholder="{% blocktrans with book_title=book.title %}Your review of '{{ book_title }}'{% endblocktrans %}"
+                value="{% firstof draft.name ''%}"
+                data-cache-draft="id_name_{{ book.id }}_{{ type }}"
+            >
         </div>
     </div>
 
@@ -31,5 +39,3 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
 {% block content_label %}
     {% trans "Review:" %}
 {% endblock %}
-
-{% endwith %}
diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html
index fe2a2f03d..302f181ed 100644
--- a/bookwyrm/templates/snippets/form_rate_stars.html
+++ b/bookwyrm/templates/snippets/form_rate_stars.html
@@ -1,5 +1,6 @@
 {% spaceless %}
 {% load i18n %}
+{% load stars %}
 
 <div class="
     field is-grouped
@@ -20,6 +21,24 @@
     </label>
 
     {% for i in '12345'|make_list %}
+        <label
+            class="is-sr-only"
+            for="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter0 }}_half"
+        >
+                {% blocktranslate trimmed count rating=forloop.counter0 with half_rating=forloop.counter0|half_star %}
+                    {{ half_rating }} star
+                {% plural %}
+                    {{ half_rating }} stars
+                {% endblocktranslate %}
+        </label>
+        <input
+            id="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter0 }}_half"
+            class="is-sr-only half"
+            type="radio"
+            name="rating"
+            value="{{ forloop.counter0 }}.5"
+            {% if default_rating == forloop.counter %}checked{% endif %}
+        />
         <input
             id="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter }}"
             class="is-sr-only"
@@ -39,6 +58,7 @@
                 {% endif %}
             "
             for="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter }}"
+            data-for-half="{{ type|slugify }}_book{{ book.id }}_star_{{ forloop.counter0 }}_half"
         >
             <span class="is-sr-only">
                 {% blocktranslate trimmed count rating=forloop.counter %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index 09f052a72..3afcf2ac9 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<form method="post" name="goal" action="{{ request.user.local_path }}/goal/{{ year }}">
+<form method="post" name="goal" action="{% url 'user-goal' request.user.localname year %}">
     {% csrf_token %}
     <input type="hidden" name="year" value="{% if goal %}{{ goal.year }}{% else %}{{ year }}{% endif %}">
     <input type="hidden" name="user" value="{{ request.user.id }}">
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
index 3a0346931..b041b70aa 100644
--- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -9,7 +9,7 @@ Finish "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
+<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post" class="submit-status">
 {% csrf_token %}
 <input type="hidden" name="reading_status" value="read">
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/form.html b/bookwyrm/templates/snippets/reading_modals/form.html
index d1ba916ff..382407ba7 100644
--- a/bookwyrm/templates/snippets/reading_modals/form.html
+++ b/bookwyrm/templates/snippets/reading_modals/form.html
@@ -12,4 +12,5 @@
 <input type="hidden" name="user" value="{{ request.user.id }}">
 <input type="hidden" name="mention_books" value="{{ book.id }}">
 <input type="hidden" name="book" value="{{ book.id }}">
+<input type="hidden" name="id" value="{{ readthrough.id }}">
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
index daa87ade1..6fefae010 100644
--- a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
@@ -6,8 +6,7 @@
 {% endblock %}
 
 {% block modal-form-open %}
-<form action="{% url 'edit-readthrough' %}" method="POST">
-{% csrf_token %}
+<form action="{% url 'edit-readthrough' %}" method="POST" class="submit-status">
 {% endblock %}
 
 {% block reading-dates %}
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
index 099fd9153..827c0a86d 100644
--- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -9,7 +9,7 @@ Start "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
+<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post" class="submit-status">
 <input type="hidden" name="reading_status" value="reading">
 {% csrf_token %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index 1213b18e9..5dec637be 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -9,7 +9,7 @@ Want to Read "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
+<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post" class="submit-status">
 <input type="hidden" name="reading_status" value="to-read">
 {% csrf_token %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 189418122..0af16a935 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -6,7 +6,7 @@
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
 {% latest_read_through book request.user as readthrough %}
-<div class="field has-addons mb-0">
+<div class="field has-addons mb-0" data-shelve-button-book="{{ book.id }}">
     {% if switch_mode and active_shelf.book != book %}
     <div class="control">
         {% include 'snippets/switch_edition_button.html' with edition=book size='is-small' %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
index 353a37a1c..43e9591fb 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block dropdown-list %}
-{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
+{% include 'snippets/shelve_button/shelve_button_dropdown_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
new file mode 100644
index 000000000..32319f863
--- /dev/null
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html
@@ -0,0 +1,69 @@
+{% load bookwyrm_tags %}
+{% load utilities %}
+{% load i18n %}
+
+{% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}
+
+{% for shelf in shelves %}
+{% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
+    <li role="menuitem" class="dropdown-item p-0">
+        <div
+            class="{% if next_shelf_identifier == shelf.identifier %}is-hidden{% endif %}"
+            data-shelf-dropdown-identifier="{{ shelf.identifier }}"
+            data-shelf-next="{{ shelf.identifier|next_shelf }}"
+        >
+        {% if shelf.identifier == 'reading' %}
+
+            {% trans "Start reading" as button_text %}
+            {% url 'reading-status' 'start' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.identifier == 'read' %}
+
+            {% trans "Read" as button_text %}
+            {% url 'reading-status' 'finish' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.identifier == 'to-read' %}
+
+            {% trans "Want to read" as button_text %}
+            {% url 'reading-status' 'want' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
+
+        {% elif shelf.editable %}
+
+            <form name="shelve" action="/shelve/" method="post">
+                {% csrf_token %}
+                <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+                <button class="button {{ class }}" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
+                    <span>{{ shelf.name }}</span>
+                </button>
+            </form>
+
+        {% endif %}
+        </div>
+    </li>
+{% endfor %}
+
+{% if readthrough and active_shelf.shelf.identifier != 'read' %}
+<li role="menuitem" class="dropdown-item p-0" data-extra-options>
+    {% trans "Update progress" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
+</li>
+{% endif %}
+
+{% if active_shelf.shelf %}
+<li role="menuitem" class="dropdown-item p-0" data-extra-options>
+    <form  name="shelve" action="/unshelve/" method="post">
+        {% csrf_token %}
+        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+        <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
+            {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
+        </button>
+    </form>
+</li>
+{% endif %}
+
+{% endwith %}
+
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 0bda58602..393340922 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -2,33 +2,43 @@
 {% load utilities %}
 {% load i18n %}
 
-{% for shelf in shelves %}
-{% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
-{% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
-    <div class="{% if not dropdown and active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
-    {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+{% with next_shelf_identifier=active_shelf.shelf.identifier|next_shelf %}
 
-        {% trans "Start reading" as button_text %}
-        {% url 'reading-status' 'start' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" disabled=is_current fallback_url=fallback_url %}
-
-    {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+<div
+    class="{% if next_shelf_identifier != 'complete' %}is-hidden{% endif %}"
+    data-shelf-identifier="complete"
+>
     <button type="button" class="button {{ class }}" disabled>
         <span>{% trans "Read" %}</span>
     </button>
-    {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+</div>
 
-        {% trans "Finish reading" as button_text %}
-        {% url 'reading-status' 'finish' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" disabled=is_current fallback_url=fallback_url %}
+{% for shelf in shelves %}
+    <div
+        class="{% if next_shelf_identifier != shelf.identifier %}is-hidden{% endif %}"
+        data-shelf-identifier="{{ shelf.identifier }}"
+        data-shelf-next="{{ shelf.identifier|next_shelf }}"
+    >
+    {% if shelf.identifier == 'reading' %}
 
-    {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+            {% trans "Start reading" as button_text %}
+            {% url 'reading-status' 'start' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start_reading" controls_uid=button_uuid focus="modal_title_start_reading" fallback_url=fallback_url %}
 
-        {% trans "Want to read" as button_text %}
-        {% url 'reading-status' 'want' book.id as fallback_url %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" disabled=is_current fallback_url=fallback_url %}
+    {% elif shelf.identifier == 'read' %}
+
+            {% trans "Finish reading" as button_text %}
+            {% url 'reading-status' 'finish' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish_reading" controls_uid=button_uuid focus="modal_title_finish_reading" fallback_url=fallback_url %}
+
+    {% elif shelf.identifier == 'to-read' %}
+
+            {% trans "Want to read" as button_text %}
+            {% url 'reading-status' 'want' book.id as fallback_url %}
+            {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want_to_read" controls_uid=button_uuid focus="modal_title_want_to_read" fallback_url=fallback_url %}
+
+    {% elif shelf.editable %}
 
-    {% endif %}{% elif shelf.editable %}
         <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
             <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
@@ -36,30 +46,9 @@
                 <span>{{ shelf.name }}</span>
             </button>
         </form>
+
     {% endif %}
     </div>
-{% if dropdown %}</li>{% endif %}
 {% endfor %}
-{% if dropdown %}
 
-{% if readthrough and not readthrough.finish_date and active_shelf.shelf.identifier != 'read' %}
-<li role="menuitem" class="dropdown-item p-0">
-    {% trans "Update progress" as button_text %}
-    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress_update" controls_uid=button_uuid focus="modal_title_progress_update" %}
-</li>
-{% endif %}
-
-{% if active_shelf.shelf %}
-<li role="menuitem" class="dropdown-item p-0">
-    <form  name="shelve" action="/unshelve/" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-        <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
-            {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
-        </button>
-    </form>
-</li>
-{% endif %}
-
-{% endif %}
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 781af2793..01734cc78 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -2,6 +2,7 @@
 {% load markdown %}
 {% load i18n %}
 {% load static %}
+{% load humanize %}
 
 {% with status_type=status.status_type %}
 <div
@@ -66,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>
@@ -83,19 +90,20 @@
                     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>
+                        <blockquote dir="auto" class="content mb-2 preserve-whitespace">{{ status.quote|safe }}</blockquote>
 
-                        <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+                        <p>
+                            &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}
+                            {% if status.position %}
+                                {% if status.position_mode == 'PG' %}
+                                    {% blocktrans with page=status.position|intcomma %}(Page {{ page }}){% endblocktrans %}
+                                {% else %}
+                                    {% blocktrans with percent=status.position %}({{ percent }}%){% endblocktrans %}
+                                {% endif %}
+                            {% endif %}
+                        </p>
                     </div>
                 {% endif %}
 
@@ -131,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>
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 6ffdd0f72..39445d9c1 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -66,7 +66,7 @@
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
-<section class="is-hidden" id="show_comment_{{ status.id }}">
+<section class="reply-panel is-hidden" id="show_comment_{{ status.id }}">
     <div class="card-footer">
         <div class="card-footer-item">
             {% include 'snippets/create_status/status.html' with type="reply" reply_parent=status book=None %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index e0227a449..0c14405c2 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -10,7 +10,7 @@
                 {% if not no_trim and trimmed != full %}
                     <div id="hide_full_{{ uuid }}">
                         <div class="content" id="trimmed_{{ uuid }}">
-                            <div dir="auto">{{ trimmed }}</div>
+                            <div dir="auto" class="preserve-whitespace">{{ trimmed }}</div>
 
                             <div>
                             {% if not hide_more %}
@@ -25,6 +25,7 @@
                         <div class="content">
                             <div
                                 dir="auto"
+                                class="preserve-whitespace"
                                 {% if itemprop %}itemprop="{{ itemprop }}"{% endif %}
                             >
                                 {{ full }}
@@ -41,6 +42,7 @@
                     <div class="content">
                         <div
                             dir="auto"
+                            class="preserve-whitespace"
                             {% if itemprop %}itemprop="{{ itemprop }}"{% endif %}
                         >
                             {{ full }}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 61458fcc9..06507d3ed 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -24,11 +24,26 @@
         <div class="tabs">
             <ul>
             <li class="{% if shelf.identifier == 'all' %}is-active{% endif %}">
-                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>{% trans "All books" %}</a>
+                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>
+                    {% trans "All books" %}
+                </a>
             </li>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                <a href="{{ shelf_tab.local_path }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
+                <a
+                    href="{{ shelf_tab.local_path }}"
+                    {% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}
+                >
+                    {% if shelf_tab.identifier == 'to-read' %}
+                        {% trans "To Read" %}
+                    {% elif shelf_tab.identifier == 'reading' %}
+                        {% trans "Currently Reading" %}
+                    {% elif shelf_tab.identifier == 'read' %}
+                        {% trans "Read" %}
+                    {% else %}
+                        {{ shelf_tab.name }}
+                    {% endif %}
+                </a>
             </li>
             {% endfor %}
             </ul>
@@ -55,6 +70,23 @@
             <span class="subtitle">
                 {% include 'snippets/privacy-icons.html' with item=shelf %}
             </span>
+            {% with count=books.paginator.count %}
+            {% if count %}
+            <p class="help">
+                {% blocktrans trimmed count counter=count with formatted_count=count|intcomma %}
+                    {{ formatted_count }} book
+                {% plural %}
+                    {{ formatted_count }} books
+                {% endblocktrans %}
+
+                {% if books.has_other_pages %}
+                    {% blocktrans trimmed with start=books.start_index end=books.end_index %}
+                    (showing {{ start }}-{{ end }})
+                    {% endblocktrans %}
+                {% endif %}
+            </p>
+            {% endif %}
+            {% endwith %}
         </h2>
     </div>
     {% if is_self and shelf.id %}
diff --git a/bookwyrm/templates/user_admin/delete_user_form.html b/bookwyrm/templates/user_admin/delete_user_form.html
new file mode 100644
index 000000000..158745d05
--- /dev/null
+++ b/bookwyrm/templates/user_admin/delete_user_form.html
@@ -0,0 +1,25 @@
+{% extends "components/inline_form.html" %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Permanently delete user" %}
+{% endblock %}
+
+{% block form %}
+<form name="delete-user" action="{% url 'settings-delete-user' user.id %}" method="post">
+    {% csrf_token %}
+    <p>
+        {% blocktrans trimmed with username=user.localname %}
+        Are you sure you want to delete <strong>{{ username}}</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion.
+        {% endblocktrans %}
+    </p>
+    <div class="field">
+        <label class="label" for="id_password">{% trans "Your password:" %}</label>
+        <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required>
+        {% for error in form.password.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </div>
+    <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
+</form>
+{% endblock %}
diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index c79c6971f..e3a2413a9 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -1,14 +1,16 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 
 {% block title %}{{ user.username }}{% endblock %}
-{% block header %}{{ user.username }}{% endblock %}
+{% block header %}
+{{ user.username }}
+<p class="help has-text-weight-normal">
+    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
+</p>
+
+{% endblock %}
 
 {% block panel %}
-<div class="block">
-    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
-</div>
-
 {% include 'user_admin/user_info.html' with user=user %}
 
 {% include 'user_admin/user_moderation_actions.html' with user=user %}
diff --git a/bookwyrm/templates/user_admin/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html
index 4b4c79793..024ebfecf 100644
--- a/bookwyrm/templates/user_admin/user_admin.html
+++ b/bookwyrm/templates/user_admin/user_admin.html
@@ -1,4 +1,4 @@
-{% extends 'settings/admin_layout.html' %}
+{% extends 'settings/layout.html' %}
 {% load i18n %}
 {% block title %}{% trans "Users" %}{% endblock %}
 
diff --git a/bookwyrm/templates/user_admin/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html
index 5283b4e9c..c9c7a93fc 100644
--- a/bookwyrm/templates/user_admin/user_admin_filters.html
+++ b/bookwyrm/templates/user_admin/user_admin_filters.html
@@ -1,7 +1,7 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
-{% include 'user_admin/server_filter.html' %}
 {% include 'user_admin/username_filter.html' %}
 {% include 'directory/community_filter.html' %}
+{% include 'user_admin/server_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
index 579b3af7e..7ad57e0ef 100644
--- a/bookwyrm/templates/user_admin/user_info.html
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -1,8 +1,10 @@
 {% load i18n %}
 {% load markdown %}
+{% load humanize %}
+
 <div class="block columns">
     <div class="column is-flex is-flex-direction-column">
-        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <h4 class="title is-4">{% trans "Profile" %}</h4>
         <div class="box is-flex-grow-1">
             {% include 'user/user_preview.html' with user=user %}
             {% if user.summary %}
@@ -14,6 +16,95 @@
             <p class="mt-2"><a href="{{ user.local_path }}">{% trans "View user profile" %}</a></p>
         </div>
     </div>
+    <div class="column is-flex is-flex-direction-column is-4">
+        <h4 class="title is-4">{% trans "Status" %}</h4>
+        <div class="box is-flex-grow-1 has-text-weight-bold">
+            {% if user.is_active %}
+            <p class="notification is-success">
+                {% trans "Active" %}
+            </p>
+            {% else %}
+            <p class="notification is-warning">
+                {% trans "Inactive" %}
+                {% if user.deactivation_reason %}
+                <span class="help">({% trans user.get_deactivation_reason_display %})</span>
+                {% endif %}
+            </p>
+            {% endif %}
+            <p class="notification">
+                {% if user.local %}
+                {% trans "Local" %}
+                {% else %}
+                {% trans "Remote" %}
+                {% endif %}
+            </p>
+        </div>
+    </div>
+</div>
+
+<div class="block columns">
+    <div class="column is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <div class="box content is-flex-grow-1">
+            <dl>
+                {% if user.local %}
+                <div class="is-flex">
+                    <dt>{% trans "Email:" %}</dt>
+                    <dd>{{ user.email }}</dd>
+                </div>
+                {% endif %}
+
+                {% with report_count=user.report_set.count %}
+                <div class="is-flex">
+                    <dt>{% trans "Reports:" %}</dt>
+                    <dd>
+                        {{ report_count|intcomma }}
+                        {% if report_count > 0 %}
+                        <a href="{% url 'settings-reports' %}?username={{ user.username }}">
+                            {% trans "(View reports)" %}
+                        </a>
+                        {% endif %}
+                    </dd>
+                </div>
+                {% endwith %}
+
+                <div class="is-flex">
+                    <dt>{% trans "Blocked by count:" %}</dt>
+                    <dd>{{ user.blocked_by.count }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Last active date:" %}</dt>
+                    <dd>{{ user.last_active_date }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Manually approved followers:" %}</dt>
+                    <dd>{{ user.manually_approves_followers }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Discoverable:" %}</dt>
+                    <dd>{{ user.discoverable }}</dd>
+                </div>
+
+                {% if not user.is_active %}
+                <div class="is-flex">
+                    <dt>{% trans "Deactivation reason:" %}</dt>
+                    <dd>{{ user.deactivation_reason }}</dd>
+                </div>
+                {% endif %}
+
+                {% if not user.is_active and user.deactivation_reason == "pending" %}
+                <div class="is-flex">
+                    <dt>{% trans "Confirmation code:" %}</dt>
+                    <dd>{{ user.confirmation_code }}</dd>
+                </div>
+                {% endif %}
+            </dl>
+        </div>
+    </div>
+
     {% if not user.local %}
     {% with server=user.federated_server %}
     <div class="column is-half is-flex is-flex-direction-column">
diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
index e4460a687..12b70d3ca 100644
--- a/bookwyrm/templates/user_admin/user_moderation_actions.html
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="block content">
-    {% if not user.is_active and user.deactivation_reason == "self_deletion" %}
+    {% if not user.is_active and user.deactivation_reason == "self_deletion" or user.deactivation_reason == "moderator_deletion" %}
     <div class="notification is-danger">
         {% trans "Permanently deleted" %}
     </div>
@@ -8,19 +8,38 @@
     <h3>{% trans "Actions" %}</h3>
 
     <div class="is-flex">
+        {% if user.is_active %}
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' user.username %}">{% trans "Send direct message" %}</a>
         </p>
-        <form name="suspend" method="post" action="{% url 'settings-report-suspend' user.id  %}">
+        {% endif %}
+
+        {% if user.is_active or user.deactivation_reason == "pending" %}
+        <form name="suspend" method="post" action="{% url 'settings-report-suspend' user.id  %}" class="mr-1">
             {% csrf_token %}
-            {% if user.is_active %}
             <button type="submit" class="button is-danger is-light">{% trans "Suspend user" %}</button>
-            {% else %}
-            <button class="button">{% trans "Un-suspend user" %}</button>
-            {% endif %}
         </form>
+        {% else %}
+        <form name="unsuspend" method="post" action="{% url 'settings-report-unsuspend' user.id  %}" class="mr-1">
+            {% csrf_token %}
+            <button class="button">{% trans "Un-suspend user" %}</button>
+        </form>
+        {% endif %}
+
+        {% if user.local %}
+        <div>
+            {% trans "Permanently delete user" as button_text %}
+            {% include "snippets/toggle/open_button.html" with controls_text="delete_user" text=button_text class="is-danger is-light" %}
+        </div>
+        {% endif %}
     </div>
 
+    {% if user.local %}
+    <div>
+        {% include "user_admin/delete_user_form.html" with controls_text="delete_user" class="mt-2 mb-2" %}
+    </div>
+    {% endif %}
+
     {% if user.local %}
     <div>
         <form name="permission" method="post" action="{% url 'settings-user' user.id %}">
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 4811f4fd5..e683f9c24 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -12,7 +12,7 @@ register = template.Library()
 def get_rating(book, user):
     """get the overall rating of a book"""
     queryset = views.helpers.privacy_filter(
-        user, models.Review.objects.filter(book__in=book.parent_work.editions.all())
+        user, models.Review.objects.filter(book__parent_work__editions=book)
     )
     return queryset.aggregate(Avg("rating"))["rating__avg"]
 
@@ -49,7 +49,7 @@ def get_next_shelf(current_shelf):
     if current_shelf == "reading":
         return "read"
     if current_shelf == "read":
-        return "read"
+        return "complete"
     return "to-read"
 
 
@@ -70,10 +70,13 @@ def related_status(notification):
 @register.simple_tag(takes_context=True)
 def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
+    if hasattr(book, "current_shelves"):
+        return book.current_shelves[0] if len(book.current_shelves) else {"book": book}
+
     shelf = (
         models.ShelfBook.objects.filter(
             shelf__user=context["request"].user,
-            book__in=book.parent_work.editions.all(),
+            book__parent_work__editions=book,
         )
         .select_related("book", "shelf")
         .first()
@@ -84,8 +87,11 @@ def active_shelf(context, book):
 @register.simple_tag(takes_context=False)
 def latest_read_through(book, user):
     """the most recent read activity"""
+    if hasattr(book, "active_readthroughs"):
+        return book.active_readthroughs[0] if len(book.active_readthroughs) else None
+
     return (
-        models.ReadThrough.objects.filter(user=user, book=book)
+        models.ReadThrough.objects.filter(user=user, book=book, is_active=True)
         .order_by("-start_date")
         .first()
     )
@@ -97,4 +103,4 @@ def mutuals_count(context, user):
     viewer = context["request"].user
     if not viewer.is_authenticated:
         return None
-    return user.followers.filter(id__in=viewer.following.all()).count()
+    return user.followers.filter(followers=viewer).count()
diff --git a/bookwyrm/templatetags/stars.py b/bookwyrm/templatetags/stars.py
new file mode 100644
index 000000000..d08dd8ef0
--- /dev/null
+++ b/bookwyrm/templatetags/stars.py
@@ -0,0 +1,11 @@
+""" template filters """
+from django import template
+
+
+register = template.Library()
+
+
+@register.filter(name="half_star")
+def get_half_star(value):
+    """one of those things that's weirdly hard with templates"""
+    return f"{value}.5"
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index abb524998..76b4cd3f6 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -12,7 +12,7 @@ register = template.Library()
 @register.filter(name="uuid")
 def get_uuid(identifier):
     """for avoiding clashing ids when there are many forms"""
-    return "%s%s" % (identifier, uuid4())
+    return f"{identifier}{uuid4()}"
 
 
 @register.filter(name="username")
@@ -37,7 +37,7 @@ def get_title(book, too_short=5):
 
 @register.simple_tag(takes_context=False)
 def comparison_bool(str1, str2):
-    """idk why I need to write a tag for this, it reutrns a bool"""
+    """idk why I need to write a tag for this, it returns a bool"""
     return str1 == str2
 
 
@@ -50,16 +50,17 @@ def truncatepath(value, arg):
         length = int(arg)
     except ValueError:  # invalid literal for int()
         return path_list[-1]  # Fail silently.
-    return "%s/…%s" % (path_list[0], path_list[-1][-length:])
+    return f"{path_list[0]}/…{path_list[-1][-length:]}"
 
 
 @register.simple_tag(takes_context=False)
 def get_book_cover_thumbnail(book, size="medium", ext="jpg"):
-    """Returns a book thumbnail at the specified size and extension, with fallback if needed"""
+    """Returns a book thumbnail at the specified size and extension,
+    with fallback if needed"""
     if size == "":
         size = "medium"
     try:
-        cover_thumbnail = getattr(book, "cover_bw_book_%s_%s" % (size, ext))
+        cover_thumbnail = getattr(book, f"cover_bw_book_{size}_{ext}")
         return cover_thumbnail.url
     except OSError:
         return static("images/no_cover.jpg")
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index 0758fe99a..7117eb52a 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -19,16 +19,19 @@ from bookwyrm.activitypub import ActivitySerializerError
 from bookwyrm import models
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class BaseActivity(TestCase):
     """the super class for model-linked activitypub dataclasses"""
 
     def setUp(self):
         """we're probably going to re-use this so why copy/paste"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py
index 67aaf891e..2722aaefd 100644
--- a/bookwyrm/tests/activitypub/test_person.py
+++ b/bookwyrm/tests/activitypub/test_person.py
@@ -25,3 +25,4 @@ class Person(TestCase):
         self.assertEqual(user.username, "mouse@example.com")
         self.assertEqual(user.remote_id, "https://example.com/user/mouse")
         self.assertFalse(user.local)
+        self.assertEqual(user.followers_url, "https://example.com/user/mouse/followers")
diff --git a/bookwyrm/tests/activitystreams/__init__.py b/bookwyrm/tests/activitystreams/__init__.py
new file mode 100644
index 000000000..b6e690fd5
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/activitystreams/test_abstractstream.py b/bookwyrm/tests/activitystreams/test_abstractstream.py
new file mode 100644
index 000000000..f96742865
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_abstractstream.py
@@ -0,0 +1,145 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class Activitystreams(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+            self.another_user = models.User.objects.create_user(
+                "nutria",
+                "nutria@nutria.nutria",
+                "password",
+                local=True,
+                localname="nutria",
+            )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
+
+        class TestStream(activitystreams.ActivityStream):
+            """test stream, don't have to do anything here"""
+
+            key = "test"
+
+        self.test_stream = TestStream()
+
+    def test_activitystream_class_ids(self, *_):
+        """the abstract base class for stream objects"""
+        self.assertEqual(
+            self.test_stream.stream_id(self.local_user),
+            "{}-test".format(self.local_user.id),
+        )
+        self.assertEqual(
+            self.test_stream.unread_id(self.local_user),
+            "{}-test-unread".format(self.local_user.id),
+        )
+
+    def test_abstractstream_get_audience(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = self.test_stream.get_audience(status)
+        # remote users don't have feeds
+        self.assertFalse(self.remote_user in users)
+        self.assertTrue(self.local_user in users)
+        self.assertTrue(self.another_user in users)
+
+    def test_abstractstream_get_audience_direct(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+        )
+        status.mention_users.add(self.local_user)
+        users = self.test_stream.get_audience(status)
+        self.assertEqual(users, [])
+
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        status.mention_users.add(self.local_user)
+        users = self.test_stream.get_audience(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    def test_abstractstream_get_audience_followers_remote_user(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="followers",
+        )
+        users = self.test_stream.get_audience(status)
+        self.assertFalse(users.exists())
+
+    def test_abstractstream_get_audience_followers_self(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Comment.objects.create(
+            user=self.local_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        users = self.test_stream.get_audience(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    def test_abstractstream_get_audience_followers_with_mention(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        status.mention_users.add(self.local_user)
+
+        users = self.test_stream.get_audience(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    def test_abstractstream_get_audience_followers_with_relationship(self, *_):
+        """get a list of users that should see a status"""
+        self.remote_user.followers.add(self.local_user)
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        users = self.test_stream.get_audience(status)
+        self.assertFalse(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
diff --git a/bookwyrm/tests/activitystreams/test_booksstream.py b/bookwyrm/tests/activitystreams/test_booksstream.py
new file mode 100644
index 000000000..d6d94b738
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_booksstream.py
@@ -0,0 +1,54 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class Activitystreams(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
+
+    def test_get_statuses_for_user_books(self, *_):
+        """create a stream for a user"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="public", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        result = activitystreams.BooksStream().get_statuses_for_user(self.local_user)
+        self.assertEqual(list(result), [status])
diff --git a/bookwyrm/tests/activitystreams/test_homestream.py b/bookwyrm/tests/activitystreams/test_homestream.py
new file mode 100644
index 000000000..42a73f3cf
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_homestream.py
@@ -0,0 +1,67 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class Activitystreams(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+            self.another_user = models.User.objects.create_user(
+                "nutria",
+                "nutria@nutria.nutria",
+                "password",
+                local=True,
+                localname="nutria",
+            )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+    def test_homestream_get_audience(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.HomeStream().get_audience(status)
+        self.assertFalse(users.exists())
+
+    def test_homestream_get_audience_with_mentions(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        status.mention_users.add(self.local_user)
+        users = activitystreams.HomeStream().get_audience(status)
+        self.assertFalse(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+
+    def test_homestream_get_audience_with_relationship(self, *_):
+        """get a list of users that should see a status"""
+        self.remote_user.followers.add(self.local_user)
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.HomeStream().get_audience(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
diff --git a/bookwyrm/tests/activitystreams/test_localstream.py b/bookwyrm/tests/activitystreams/test_localstream.py
new file mode 100644
index 000000000..e6b05557f
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_localstream.py
@@ -0,0 +1,139 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class Activitystreams(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+            self.another_user = models.User.objects.create_user(
+                "nutria",
+                "nutria@nutria.nutria",
+                "password",
+                local=True,
+                localname="nutria",
+            )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
+
+    def test_localstream_get_audience_remote_status(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.LocalStream().get_audience(status)
+        self.assertEqual(users, [])
+
+    def test_localstream_get_audience_local_status(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        users = activitystreams.LocalStream().get_audience(status)
+        self.assertTrue(self.local_user in users)
+        self.assertTrue(self.another_user in users)
+
+    def test_localstream_get_audience_unlisted(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="unlisted"
+        )
+        users = activitystreams.LocalStream().get_audience(status)
+        self.assertEqual(users, [])
+
+    def test_localstream_get_audience_books_no_book(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        audience = activitystreams.BooksStream().get_audience(status)
+        # no books, no audience
+        self.assertEqual(audience, [])
+
+    def test_localstream_get_audience_books_mention_books(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        status.mention_books.add(self.book)
+        status.save(broadcast=False)
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_book_field(self, *_):
+        """get a list of users that should see a status"""
+        status = models.Comment.objects.create(
+            user=self.local_user, content="hi", privacy="public", book=self.book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_alternate_edition(self, *_):
+        """get a list of users that should see a status"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="public", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertTrue(self.local_user in audience)
+
+    def test_localstream_get_audience_books_non_public(self, *_):
+        """get a list of users that should see a status"""
+        alt_book = models.Edition.objects.create(
+            title="hi", parent_work=self.book.parent_work
+        )
+        status = models.Comment.objects.create(
+            user=self.remote_user, content="hi", privacy="unlisted", book=alt_book
+        )
+        models.ShelfBook.objects.create(
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.first(),
+            book=self.book,
+        )
+        # yes book, yes audience
+        audience = activitystreams.BooksStream().get_audience(status)
+        self.assertEqual(audience, [])
diff --git a/bookwyrm/tests/activitystreams/test_signals.py b/bookwyrm/tests/activitystreams/test_signals.py
new file mode 100644
index 000000000..1c94cc9f5
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_signals.py
@@ -0,0 +1,68 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+class ActivitystreamsSignals(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
+
+    def test_add_status_on_create_ignore(self, _):
+        """a new statuses has entered"""
+        activitystreams.add_status_on_create(models.User, self.local_user, False)
+
+    def test_add_status_on_create_deleted(self, _):
+        """a new statuses has entered"""
+        with patch("bookwyrm.activitystreams.remove_status_task.delay"):
+            status = models.Status.objects.create(
+                user=self.remote_user, content="hi", privacy="public", deleted=True
+            )
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
+            activitystreams.add_status_on_create(models.Status, status, False)
+        self.assertEqual(mock.call_count, 1)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], status.id)
+
+    def test_add_status_on_create_created(self, _):
+        """a new statuses has entered"""
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        with patch("bookwyrm.activitystreams.add_status_task.delay") as mock:
+            activitystreams.add_status_on_create_command(models.Status, status, False)
+        self.assertEqual(mock.call_count, 1)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], status.id)
+
+    def test_populate_streams_on_account_create(self, _):
+        """create streams for a user"""
+        with patch("bookwyrm.activitystreams.populate_stream_task.delay") as mock:
+            activitystreams.populate_streams_on_account_create(
+                models.User, self.local_user, True
+            )
+        self.assertEqual(mock.call_count, 3)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], "books")
+        self.assertEqual(args[1], self.local_user.id)
diff --git a/bookwyrm/tests/activitystreams/test_tasks.py b/bookwyrm/tests/activitystreams/test_tasks.py
new file mode 100644
index 000000000..f4c85e1bf
--- /dev/null
+++ b/bookwyrm/tests/activitystreams/test_tasks.py
@@ -0,0 +1,193 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+class Activitystreams(TestCase):
+    """using redis to build activity streams"""
+
+    def setUp(self):
+        """use a test csv"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+            )
+            self.another_user = models.User.objects.create_user(
+                "nutria",
+                "nutria@nutria.nutria",
+                "password",
+                local=True,
+                localname="nutria",
+            )
+        work = models.Work.objects.create(title="test work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            self.status = models.Status.objects.create(
+                content="hi", user=self.local_user
+            )
+
+    def test_add_book_statuses_task(self):
+        """statuses related to a book"""
+        with patch("bookwyrm.activitystreams.BooksStream.add_book_statuses") as mock:
+            activitystreams.add_book_statuses_task(self.local_user.id, self.book.id)
+        self.assertTrue(mock.called)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.book)
+
+    def test_remove_book_statuses_task(self):
+        """remove stauses related to a book"""
+        with patch("bookwyrm.activitystreams.BooksStream.remove_book_statuses") as mock:
+            activitystreams.remove_book_statuses_task(self.local_user.id, self.book.id)
+        self.assertTrue(mock.called)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.book)
+
+    def test_populate_stream_task(self):
+        """populate a given stream"""
+        with patch("bookwyrm.activitystreams.BooksStream.populate_streams") as mock:
+            activitystreams.populate_stream_task("books", self.local_user.id)
+        self.assertTrue(mock.called)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+
+        with patch("bookwyrm.activitystreams.HomeStream.populate_streams") as mock:
+            activitystreams.populate_stream_task("home", self.local_user.id)
+        self.assertTrue(mock.called)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+
+    def test_remove_status_task(self):
+        """remove a status from all streams"""
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.remove_status_task(self.status.id)
+        self.assertEqual(mock.call_count, 3)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.status)
+
+    def test_add_status_task(self):
+        """add a status to all streams"""
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as mock:
+            activitystreams.add_status_task(self.status.id)
+        self.assertEqual(mock.call_count, 3)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.status)
+
+    def test_remove_user_statuses_task(self):
+        """remove all statuses by a user from another users' feeds"""
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+        ) as mock:
+            activitystreams.remove_user_statuses_task(
+                self.local_user.id, self.another_user.id
+            )
+        self.assertEqual(mock.call_count, 3)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.another_user)
+
+        with patch("bookwyrm.activitystreams.HomeStream.remove_user_statuses") as mock:
+            activitystreams.remove_user_statuses_task(
+                self.local_user.id, self.another_user.id, stream_list=["home"]
+            )
+        self.assertEqual(mock.call_count, 1)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.another_user)
+
+    def test_add_user_statuses_task(self):
+        """add a user's statuses to another users feeds"""
+        with patch("bookwyrm.activitystreams.ActivityStream.add_user_statuses") as mock:
+            activitystreams.add_user_statuses_task(
+                self.local_user.id, self.another_user.id
+            )
+        self.assertEqual(mock.call_count, 3)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.another_user)
+
+        with patch("bookwyrm.activitystreams.HomeStream.add_user_statuses") as mock:
+            activitystreams.add_user_statuses_task(
+                self.local_user.id, self.another_user.id, stream_list=["home"]
+            )
+        self.assertEqual(mock.call_count, 1)
+        args = mock.call_args[0]
+        self.assertEqual(args[0], self.local_user)
+        self.assertEqual(args[1], self.another_user)
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    def test_boost_to_another_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.another_user,
+            )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.handle_boost_task(boost.id)
+
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertEqual(
+            call_args[1]["stores"], ["{:d}-home".format(self.another_user.id)]
+        )
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    def test_boost_to_following_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        self.local_user.following.add(self.another_user)
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.another_user,
+            )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.handle_boost_task(boost.id)
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertTrue(
+            "{:d}-home".format(self.another_user.id) in call_args[1]["stores"]
+        )
+        self.assertTrue(
+            "{:d}-home".format(self.local_user.id) in call_args[1]["stores"]
+        )
+
+    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    def test_boost_to_same_timeline(self, *_):
+        """add a boost and deduplicate the boosted status on the timeline"""
+        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.handle_boost_task.delay"):
+            boost = models.Boost.objects.create(
+                boosted_status=status,
+                user=self.local_user,
+            )
+        with patch(
+            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
+        ) as mock:
+            activitystreams.handle_boost_task(boost.id)
+        self.assertTrue(mock.called)
+        call_args = mock.call_args
+        self.assertEqual(call_args[0][0], status)
+        self.assertEqual(
+            call_args[1]["stores"], ["{:d}-home".format(self.local_user.id)]
+        )
diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index e92bdb354..387d9f4f2 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -22,6 +22,8 @@ def make_date(*args):
 
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class GoodreadsImport(TestCase):
     """importing from goodreads csv"""
 
@@ -30,7 +32,9 @@ class GoodreadsImport(TestCase):
         self.importer = GoodreadsImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True
             )
@@ -53,7 +57,7 @@ class GoodreadsImport(TestCase):
             parent_work=work,
         )
 
-    def test_create_job(self, _):
+    def test_create_job(self, *_):
         """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
@@ -69,7 +73,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_items[2].index, 2)
         self.assertEqual(import_items[2].data["Book Id"], "28694510")
 
-    def test_create_retry_job(self, _):
+    def test_create_retry_job(self, *_):
         """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
@@ -87,7 +91,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(retry_items[1].index, 1)
         self.assertEqual(retry_items[1].data["Book Id"], "52691223")
 
-    def test_start_import(self, _):
+    def test_start_import(self, *_):
         """begin loading books"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         MockTask = namedtuple("Task", ("id"))
@@ -99,7 +103,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_job.task_id, "7")
 
     @responses.activate
-    def test_import_data(self, _):
+    def test_import_data(self, *_):
         """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
@@ -114,7 +118,7 @@ class GoodreadsImport(TestCase):
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-    def test_handle_imported_book(self, _):
+    def test_handle_imported_book(self, *_):
         """goodreads import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
@@ -145,7 +149,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    def test_handle_imported_book_already_shelved(self, _):
+    def test_handle_imported_book_already_shelved(self, *_):
         """goodreads import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
@@ -183,7 +187,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    def test_handle_import_twice(self, _):
+    def test_handle_import_twice(self, *_):
         """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -215,7 +219,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2020, 10, 21))
         self.assertEqual(readthrough.finish_date, make_date(2020, 10, 25))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_review(self, *_):
         """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -237,7 +241,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.published_date, make_date(2019, 7, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_rating(self, *_):
         """goodreads rating import"""
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -261,7 +265,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.published_date, make_date(2019, 7, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    def test_handle_imported_book_reviews_disabled(self, _):
+    def test_handle_imported_book_reviews_disabled(self, *_):
         """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 504951c2f..dfdd515e1 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -21,6 +21,8 @@ def make_date(*args):
 
 # pylint: disable=consider-using-with
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class LibrarythingImport(TestCase):
     """importing from librarything tsv"""
 
@@ -31,7 +33,9 @@ class LibrarythingImport(TestCase):
 
         # Librarything generates latin encoded exports...
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mmai", "mmai@mmai.mmai", "password", local=True
             )
@@ -54,7 +58,7 @@ class LibrarythingImport(TestCase):
             parent_work=work,
         )
 
-    def test_create_job(self, _):
+    def test_create_job(self, *_):
         """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
@@ -70,7 +74,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(import_items[2].index, 2)
         self.assertEqual(import_items[2].data["Book Id"], "5015399")
 
-    def test_create_retry_job(self, _):
+    def test_create_retry_job(self, *_):
         """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
@@ -89,7 +93,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(retry_items[1].data["Book Id"], "5015319")
 
     @responses.activate
-    def test_import_data(self, _):
+    def test_import_data(self, *_):
         """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
@@ -104,7 +108,7 @@ class LibrarythingImport(TestCase):
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-    def test_handle_imported_book(self, _):
+    def test_handle_imported_book(self, *_):
         """librarything import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
@@ -134,7 +138,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    def test_handle_imported_book_already_shelved(self, _):
+    def test_handle_imported_book_already_shelved(self, *_):
         """librarything import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
@@ -166,7 +170,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    def test_handle_import_twice(self, _):
+    def test_handle_import_twice(self, *_):
         """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -197,7 +201,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.start_date, make_date(2007, 4, 16))
         self.assertEqual(readthrough.finish_date, make_date(2007, 5, 8))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_handle_imported_book_review(self, *_):
         """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
@@ -219,7 +223,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(review.published_date, make_date(2007, 5, 8))
         self.assertEqual(review.privacy, "unlisted")
 
-    def test_handle_imported_book_reviews_disabled(self, _):
+    def test_handle_imported_book_reviews_disabled(self, *_):
         """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index 50192a713..ca21b0ee8 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -12,7 +12,9 @@ class Activitystreams(TestCase):
 
     def setUp(self):
         """we need some stuff"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
             )
@@ -37,7 +39,7 @@ class Activitystreams(TestCase):
 
     def test_populate_streams(self, _):
         """make sure the function on the redis manager gets called"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Comment.objects.create(
                 user=self.local_user, content="hi", book=self.book
             )
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 01d06e02f..911cca5cc 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -20,14 +20,16 @@ from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable=invalid-name
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ActivitypubMixins(TestCase):
     """functionality shared across models"""
 
     def setUp(self):
         """shared data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 43cd5d3f4..7c7b48de1 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -1,5 +1,6 @@
 """ testing models """
 from unittest.mock import patch
+from django.http import Http404
 from django.test import TestCase
 
 from bookwyrm import models
@@ -13,7 +14,9 @@ class BaseModel(TestCase):
 
     def setUp(self):
         """shared data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
@@ -37,14 +40,14 @@ class BaseModel(TestCase):
         """these should be generated"""
         self.test_model.id = 1
         expected = self.test_model.get_remote_id()
-        self.assertEqual(expected, "https://%s/bookwyrmtestmodel/1" % DOMAIN)
+        self.assertEqual(expected, f"https://{DOMAIN}/bookwyrmtestmodel/1")
 
     def test_remote_id_with_user(self):
         """format of remote id when there's a user object"""
         self.test_model.user = self.local_user
         self.test_model.id = 1
         expected = self.test_model.get_remote_id()
-        self.assertEqual(expected, "https://%s/user/mouse/bookwyrmtestmodel/1" % DOMAIN)
+        self.assertEqual(expected, f"https://{DOMAIN}/user/mouse/bookwyrmtestmodel/1")
 
     def test_set_remote_id(self):
         """this function sets remote ids after creation"""
@@ -53,74 +56,77 @@ class BaseModel(TestCase):
         instance = models.Work.objects.create(title="work title")
         instance.remote_id = None
         base_model.set_remote_id(None, instance, True)
-        self.assertEqual(
-            instance.remote_id, "https://%s/book/%d" % (DOMAIN, instance.id)
-        )
+        self.assertEqual(instance.remote_id, f"https://{DOMAIN}/book/{instance.id}")
 
         # shouldn't set remote_id if it's not created
         instance.remote_id = None
         base_model.set_remote_id(None, instance, False)
         self.assertIsNone(instance.remote_id)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user(self, _):
         """does a user have permission to view an object"""
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="public"
         )
-        self.assertTrue(obj.visible_to_user(self.local_user))
+        self.assertIsNone(obj.raise_visible_to_user(self.local_user))
 
         obj = models.Shelf.objects.create(
             name="test", user=self.remote_user, privacy="unlisted"
         )
-        self.assertTrue(obj.visible_to_user(self.local_user))
+        self.assertIsNone(obj.raise_visible_to_user(self.local_user))
 
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="followers"
         )
-        self.assertFalse(obj.visible_to_user(self.local_user))
+        with self.assertRaises(Http404):
+            obj.raise_visible_to_user(self.local_user)
 
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="direct"
         )
-        self.assertFalse(obj.visible_to_user(self.local_user))
+        with self.assertRaises(Http404):
+            obj.raise_visible_to_user(self.local_user)
 
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="direct"
         )
         obj.mention_users.add(self.local_user)
-        self.assertTrue(obj.visible_to_user(self.local_user))
+        self.assertIsNone(obj.raise_visible_to_user(self.local_user))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user_follower(self, _):
         """what you can see if you follow a user"""
         self.remote_user.followers.add(self.local_user)
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="followers"
         )
-        self.assertTrue(obj.visible_to_user(self.local_user))
+        self.assertIsNone(obj.raise_visible_to_user(self.local_user))
 
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="direct"
         )
-        self.assertFalse(obj.visible_to_user(self.local_user))
+        with self.assertRaises(Http404):
+            obj.raise_visible_to_user(self.local_user)
 
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="direct"
         )
         obj.mention_users.add(self.local_user)
-        self.assertTrue(obj.visible_to_user(self.local_user))
+        self.assertIsNone(obj.raise_visible_to_user(self.local_user))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_object_visible_to_user_blocked(self, _):
         """you can't see it if they block you"""
         self.remote_user.blocks.add(self.local_user)
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="public"
         )
-        self.assertFalse(obj.visible_to_user(self.local_user))
+        with self.assertRaises(Http404):
+            obj.raise_visible_to_user(self.local_user)
 
         obj = models.Shelf.objects.create(
             name="test", user=self.remote_user, privacy="unlisted"
         )
-        self.assertFalse(obj.visible_to_user(self.local_user))
+        with self.assertRaises(Http404):
+            obj.raise_visible_to_user(self.local_user)
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 2520a2fd2..1796b84bd 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -25,10 +25,11 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class ModelFields(TestCase):
     """overwrites standard model feilds to work with activitypub"""
 
-    def test_validate_remote_id(self, _):
+    def test_validate_remote_id(self, *_):
         """should look like a url"""
         self.assertIsNone(fields.validate_remote_id("http://www.example.com"))
         self.assertIsNone(fields.validate_remote_id("https://www.example.com"))
@@ -45,7 +46,7 @@ class ModelFields(TestCase):
             "http://www.example.com/dlfjg 23/x",
         )
 
-    def test_activitypub_field_mixin(self, _):
+    def test_activitypub_field_mixin(self, *_):
         """generic mixin with super basic to and from functionality"""
         instance = fields.ActivitypubFieldMixin()
         self.assertEqual(instance.field_to_activity("fish"), "fish")
@@ -63,7 +64,7 @@ class ModelFields(TestCase):
         instance.name = "snake_case_name"
         self.assertEqual(instance.get_activitypub_field(), "snakeCaseName")
 
-    def test_set_field_from_activity(self, _):
+    def test_set_field_from_activity(self, *_):
         """setter from entire json blob"""
 
         @dataclass
@@ -82,7 +83,7 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(mock_model, data)
         self.assertEqual(mock_model.field_name, "hi")
 
-    def test_set_activity_from_field(self, _):
+    def test_set_activity_from_field(self, *_):
         """set json field given entire model"""
 
         @dataclass
@@ -100,7 +101,7 @@ class ModelFields(TestCase):
         instance.set_activity_from_field(data, mock_model)
         self.assertEqual(data["fieldName"], "bip")
 
-    def test_remote_id_field(self, _):
+    def test_remote_id_field(self, *_):
         """just sets some defaults on charfield"""
         instance = fields.RemoteIdField()
         self.assertEqual(instance.max_length, 255)
@@ -109,7 +110,7 @@ class ModelFields(TestCase):
         with self.assertRaises(ValidationError):
             instance.run_validators("http://www.example.com/dlfjg 23/x")
 
-    def test_username_field(self, _):
+    def test_username_field(self, *_):
         """again, just setting defaults on username field"""
         instance = fields.UsernameField()
         self.assertEqual(instance.activitypub_field, "preferredUsername")
@@ -130,7 +131,7 @@ class ModelFields(TestCase):
 
         self.assertEqual(instance.field_to_activity("test@example.com"), "test")
 
-    def test_privacy_field_defaults(self, _):
+    def test_privacy_field_defaults(self, *_):
         """post privacy field's many default values"""
         instance = fields.PrivacyField()
         self.assertEqual(instance.max_length, 255)
@@ -143,9 +144,18 @@ class ModelFields(TestCase):
             instance.public, "https://www.w3.org/ns/activitystreams#Public"
         )
 
-    def test_privacy_field_set_field_from_activity(self, _):
+    def test_privacy_field_set_field_from_activity(self, *_):
         """translate between to/cc fields and privacy"""
 
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            test_user = User.objects.create_user(
+                username="test_user@example.com",
+                local=False,
+                remote_id="https://example.com/test_user",
+                inbox="https://example.com/users/test_user/inbox",
+                followers_url="https://example.com/users/test_user/followers",
+            )
+
         @dataclass(init=False)
         class TestActivity(ActivityObject):
             """real simple mock"""
@@ -154,6 +164,7 @@ class ModelFields(TestCase):
             cc: List[str]
             id: str = "http://hi.com"
             type: str = "Test"
+            attributedTo: str = test_user.remote_id
 
         class TestPrivacyModel(ActivitypubMixin, BookWyrmModel):
             """real simple mock model because BookWyrmModel is abstract"""
@@ -185,8 +196,18 @@ class ModelFields(TestCase):
         instance.set_field_from_activity(model_instance, data)
         self.assertEqual(model_instance.privacy_field, "unlisted")
 
+        data.to = [test_user.followers_url]
+        data.cc = []
+        instance.set_field_from_activity(model_instance, data)
+        self.assertEqual(model_instance.privacy_field, "followers")
+
+        data.to = ["http://user_remote/followers"]
+        data.cc = ["http://mentioned_user/remote_id"]
+        instance.set_field_from_activity(model_instance, data)
+        self.assertEqual(model_instance.privacy_field, "followers")
+
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_privacy_field_set_activity_from_field(self, *_):
         """translate between to/cc fields and privacy"""
         user = User.objects.create_user(
@@ -231,7 +252,7 @@ class ModelFields(TestCase):
         self.assertEqual(activity["to"], [user.remote_id])
         self.assertEqual(activity["cc"], [])
 
-    def test_foreign_key(self, _):
+    def test_foreign_key(self, *_):
         """should be able to format a related model"""
         instance = fields.ForeignKey("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
@@ -240,7 +261,7 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_to_activity(item), "https://e.b/c")
 
     @responses.activate
-    def test_foreign_key_from_activity_str(self, _):
+    def test_foreign_key_from_activity_str(self, *_):
         """create a new object from a foreign key"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -287,7 +308,7 @@ class ModelFields(TestCase):
         self.assertEqual(value.name, "MOUSE?? MOUSE!!")
         # et cetera but we're not testing serializing user json
 
-    def test_foreign_key_from_activity_dict_existing(self, _):
+    def test_foreign_key_from_activity_dict_existing(self, *_):
         """test receiving a dict of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -306,7 +327,7 @@ class ModelFields(TestCase):
             value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertEqual(value, user)
 
-    def test_foreign_key_from_activity_str_existing(self, _):
+    def test_foreign_key_from_activity_str_existing(self, *_):
         """test receiving a remote id of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         user = User.objects.create_user(
@@ -319,14 +340,14 @@ class ModelFields(TestCase):
         value = instance.field_from_activity(user.remote_id)
         self.assertEqual(value, user)
 
-    def test_one_to_one_field(self, _):
+    def test_one_to_one_field(self, *_):
         """a gussied up foreign key"""
         instance = fields.OneToOneField("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
         item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
         self.assertEqual(instance.field_to_activity(item), {"a": "b"})
 
-    def test_many_to_many_field(self, _):
+    def test_many_to_many_field(self, *_):
         """lists!"""
         instance = fields.ManyToManyField("User")
 
@@ -344,7 +365,7 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_to_activity(items), "example.com/snake_case")
 
     @responses.activate
-    def test_many_to_many_field_from_activity(self, _):
+    def test_many_to_many_field_from_activity(self, *_):
         """resolve related fields for a list, takes a list of remote ids"""
         instance = fields.ManyToManyField(User)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
@@ -364,7 +385,7 @@ class ModelFields(TestCase):
         self.assertEqual(len(value), 1)
         self.assertIsInstance(value[0], User)
 
-    def test_tag_field(self, _):
+    def test_tag_field(self, *_):
         """a special type of many to many field"""
         instance = fields.TagField("User")
 
@@ -383,7 +404,7 @@ class ModelFields(TestCase):
         self.assertEqual(result[0].name, "Name")
         self.assertEqual(result[0].type, "Serializable")
 
-    def test_tag_field_from_activity(self, _):
+    def test_tag_field_from_activity(self, *_):
         """loadin' a list of items from Links"""
         # TODO
 
@@ -428,7 +449,7 @@ class ModelFields(TestCase):
         self.assertIsInstance(loaded_image, list)
         self.assertIsInstance(loaded_image[1], ContentFile)
 
-    def test_image_serialize(self, _):
+    def test_image_serialize(self, *_):
         """make sure we're creating sensible image paths"""
         ValueMock = namedtuple("ValueMock", ("url"))
         value_mock = ValueMock("/images/fish.jpg")
@@ -437,7 +458,7 @@ class ModelFields(TestCase):
         self.assertEqual(result.url, "https://your.domain.here/images/fish.jpg")
         self.assertEqual(result.name, "hello")
 
-    def test_datetime_field(self, _):
+    def test_datetime_field(self, *_):
         """this one is pretty simple, it just has to use isoformat"""
         instance = fields.DateTimeField()
         now = timezone.now()
@@ -445,12 +466,12 @@ class ModelFields(TestCase):
         self.assertEqual(instance.field_from_activity(now.isoformat()), now)
         self.assertEqual(instance.field_from_activity("bip"), None)
 
-    def test_array_field(self, _):
+    def test_array_field(self, *_):
         """idk why it makes them strings but probably for a good reason"""
         instance = fields.ArrayField(fields.IntegerField)
         self.assertEqual(instance.field_to_activity([0, 1]), ["0", "1"])
 
-    def test_html_field(self, _):
+    def test_html_field(self, *_):
         """sanitizes html, the sanitizer has its own tests"""
         instance = fields.HtmlField()
         self.assertEqual(
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index 15a75a96e..caf610349 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -59,7 +59,9 @@ class ImportJob(TestCase):
         unknown_read_data["Exclusive Shelf"] = "read"
         unknown_read_data["Date Read"] = ""
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index 6e1ff8094..0d749453e 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -11,7 +11,9 @@ class List(TestCase):
 
     def setUp(self):
         """look, a list"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index 596753f79..5d8450a1a 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -1,7 +1,9 @@
 """ testing models """
+import datetime
 from unittest.mock import patch
 from django.test import TestCase
 from django.core.exceptions import ValidationError
+from django.utils import timezone
 
 from bookwyrm import models
 
@@ -11,7 +13,9 @@ class ReadThrough(TestCase):
 
     def setUp(self):
         """look, a shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
@@ -21,27 +25,79 @@ class ReadThrough(TestCase):
             title="Example Edition", parent_work=self.work
         )
 
-        self.readthrough = models.ReadThrough.objects.create(
-            user=self.user, book=self.edition
+    def test_valid_date(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        finish = start + datetime.timedelta(days=1)
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+            finish_date=finish,
+        )
+
+    def test_valid_date_null_start(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        finish = start + datetime.timedelta(days=1)
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            finish_date=finish,
+        )
+
+    def test_valid_date_null_finish(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+        )
+
+    def test_valid_date_null(self):
+        """can't finish a book before you start it"""
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+        )
+
+    def test_valid_date_same(self):
+        """can't finish a book before you start it"""
+        start = timezone.now()
+        # just make sure there's no errors
+        models.ReadThrough.objects.create(
+            user=self.user,
+            book=self.edition,
+            start_date=start,
+            finish_date=start,
         )
 
     def test_progress_update(self):
         """Test progress updates"""
-        self.readthrough.create_update()  # No-op, no progress yet
-        self.readthrough.progress = 10
-        self.readthrough.create_update()
-        self.readthrough.progress = 20
-        self.readthrough.progress_mode = models.ProgressMode.PERCENT
-        self.readthrough.create_update()
+        readthrough = models.ReadThrough.objects.create(
+            user=self.user, book=self.edition
+        )
 
-        updates = self.readthrough.progressupdate_set.order_by("created_date").all()
+        readthrough.create_update()  # No-op, no progress yet
+        readthrough.progress = 10
+        readthrough.create_update()
+        readthrough.progress = 20
+        readthrough.progress_mode = models.ProgressMode.PERCENT
+        readthrough.create_update()
+
+        updates = readthrough.progressupdate_set.order_by("created_date").all()
         self.assertEqual(len(updates), 2)
         self.assertEqual(updates[0].progress, 10)
         self.assertEqual(updates[0].mode, models.ProgressMode.PAGE)
         self.assertEqual(updates[1].progress, 20)
         self.assertEqual(updates[1].mode, models.ProgressMode.PERCENT)
 
-        self.readthrough.progress = -10
-        self.assertRaises(ValidationError, self.readthrough.clean_fields)
-        update = self.readthrough.create_update()
+        readthrough.progress = -10
+        self.assertRaises(ValidationError, readthrough.clean_fields)
+        update = readthrough.create_update()
         self.assertRaises(ValidationError, update.clean_fields)
diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index f66cf1091..04dbe1a33 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -6,6 +6,7 @@ from django.test import TestCase
 from bookwyrm import models
 
 
+@patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
 class Relationship(TestCase):
     """following, blocking, stuff like that"""
 
@@ -21,14 +22,16 @@ class Relationship(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
             )
         self.local_user.remote_id = "http://local.com/user/mouse"
         self.local_user.save(broadcast=False, update_fields=["remote_id"])
 
-    def test_user_follows_from_request(self):
+    def test_user_follows_from_request(self, _):
         """convert a follow request into a follow"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             request = models.UserFollowRequest.objects.create(
@@ -49,7 +52,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, self.remote_user)
 
-    def test_user_follows_from_request_custom_remote_id(self):
+    def test_user_follows_from_request_custom_remote_id(self, _):
         """store a specific remote id for a relationship provided by remote"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             request = models.UserFollowRequest.objects.create(
@@ -67,7 +70,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.remote_user)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_activity(self, broadcast_mock):
+    def test_follow_request_activity(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         models.UserFollowRequest.objects.create(
             user_subject=self.local_user,
@@ -79,7 +82,7 @@ class Relationship(TestCase):
         self.assertEqual(activity["type"], "Follow")
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_accept(self, broadcast_mock):
+    def test_follow_request_accept(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
@@ -105,7 +108,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.local_user)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    def test_follow_request_reject(self, broadcast_mock):
+    def test_follow_request_reject(self, broadcast_mock, _):
         """accept a request and make it a relationship"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index f6fd68509..fe179e883 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -8,19 +8,24 @@ from bookwyrm import models, settings
 
 # pylint: disable=unused-argument
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class Shelf(TestCase):
     """some activitypub oddness ahead"""
 
     def setUp(self):
         """look, a shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
         work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(title="test book", parent_work=work)
 
-    def test_remote_id(self, _):
+    def test_remote_id(self, *_):
         """shelves use custom remote ids"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
@@ -29,7 +34,7 @@ class Shelf(TestCase):
         expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
 
-    def test_to_activity(self, _):
+    def test_to_activity(self, *_):
         """jsonify it"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
@@ -43,7 +48,7 @@ class Shelf(TestCase):
         self.assertEqual(activity_json["name"], "Test Shelf")
         self.assertEqual(activity_json["owner"], self.local_user.remote_id)
 
-    def test_create_update_shelf(self, _):
+    def test_create_update_shelf(self, *_):
         """create and broadcast shelf creation"""
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
@@ -64,7 +69,7 @@ class Shelf(TestCase):
         self.assertEqual(activity["object"]["name"], "arthur russel")
         self.assertEqual(shelf.name, "arthur russel")
 
-    def test_shelve(self, _):
+    def test_shelve(self, *_):
         """create and broadcast shelf creation"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
diff --git a/bookwyrm/tests/models/test_site.py b/bookwyrm/tests/models/test_site.py
new file mode 100644
index 000000000..b7c19c4b5
--- /dev/null
+++ b/bookwyrm/tests/models/test_site.py
@@ -0,0 +1,95 @@
+""" testing models """
+from datetime import timedelta
+from unittest.mock import patch
+
+from django.db import IntegrityError
+from django.test import TestCase
+from django.utils import timezone
+
+from bookwyrm import models, settings
+
+
+class SiteModels(TestCase):
+    """tests for site models"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.com",
+                "mouseword",
+                local=True,
+                localname="mouse",
+                remote_id="https://example.com/users/mouse",
+            )
+
+    def test_site_settings_absent(self):
+        """create and load site settings"""
+        self.assertFalse(models.SiteSettings.objects.exists())
+        result = models.SiteSettings.get()
+        self.assertTrue(models.SiteSettings.objects.exists())
+        self.assertEqual(result.id, 1)
+        self.assertEqual(result.name, "BookWyrm")
+
+    def test_site_settings_present(self):
+        """load site settings"""
+        models.SiteSettings.objects.create(id=1, name="Fish Town")
+        result = models.SiteSettings.get()
+        self.assertEqual(result.id, 1)
+        self.assertEqual(result.name, "Fish Town")
+        self.assertEqual(models.SiteSettings.objects.all().count(), 1)
+
+    def test_site_invite(self):
+        """default invite"""
+        invite = models.SiteInvite.objects.create(
+            user=self.local_user,
+        )
+        self.assertTrue(invite.valid())
+
+    def test_site_invite_with_limit(self):
+        """with use limit"""
+        # valid
+        invite = models.SiteInvite.objects.create(user=self.local_user, use_limit=1)
+        self.assertTrue(invite.valid())
+
+        # invalid
+        invite = models.SiteInvite.objects.create(user=self.local_user, use_limit=0)
+        self.assertFalse(invite.valid())
+        invite = models.SiteInvite.objects.create(
+            user=self.local_user, use_limit=1, times_used=1
+        )
+        self.assertFalse(invite.valid())
+
+    def test_site_invite_with_expiry(self):
+        """with expiration date"""
+        date = timezone.now() + timedelta(days=1)
+        invite = models.SiteInvite.objects.create(user=self.local_user, expiry=date)
+        self.assertTrue(invite.valid())
+
+        date = timezone.now() - timedelta(days=1)
+        invite = models.SiteInvite.objects.create(user=self.local_user, expiry=date)
+        self.assertFalse(invite.valid())
+
+    def test_site_invite_link(self):
+        """invite link generator"""
+        invite = models.SiteInvite.objects.create(user=self.local_user, code="hello")
+        self.assertEqual(invite.link, f"https://{settings.DOMAIN}/invite/hello")
+
+    def test_invite_request(self):
+        """someone wants an invite"""
+        # normal and good
+        request = models.InviteRequest.objects.create(email="mouse.reeve@gmail.com")
+        self.assertIsNone(request.invite)
+
+        # already in use
+        with self.assertRaises(IntegrityError):
+            request = models.InviteRequest.objects.create(email="mouse@mouse.com")
+
+    def test_password_reset(self):
+        """password reset token"""
+        token = models.PasswordReset.objects.create(user=self.local_user, code="hello")
+        self.assertTrue(token.valid())
+        self.assertEqual(token.link, f"https://{settings.DOMAIN}/password-reset/hello")
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 22b959224..6bdfa336a 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -15,14 +15,16 @@ from bookwyrm import activitypub, models, settings
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class Status(TestCase):
     """lotta types of statuses"""
 
     def setUp(self):
         """useful things for creating a status"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
             )
@@ -118,15 +120,12 @@ class Status(TestCase):
 
     def test_status_to_activity_tombstone(self, *_):
         """subclass of the base model version with a "pure" serializer"""
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            status = models.Status.objects.create(
-                content="test content",
-                user=self.local_user,
-                deleted=True,
-                deleted_date=timezone.now(),
-            )
+        status = models.Status.objects.create(
+            content="test content",
+            user=self.local_user,
+            deleted=True,
+            deleted_date=timezone.now(),
+        )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Tombstone")
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 177b2ad62..528d3fdc4 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -5,13 +5,17 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.settings import DOMAIN
+from bookwyrm.settings import USE_HTTPS, DOMAIN
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=missing-function-docstring
 class User(TestCase):
+    protocol = "https://" if USE_HTTPS else "http://"
+
     def setUp(self):
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse@%s" % DOMAIN,
                 "mouse@mouse.mouse",
@@ -24,13 +28,14 @@ class User(TestCase):
 
     def test_computed_fields(self):
         """username instead of id here"""
-        expected_id = "https://%s/user/mouse" % DOMAIN
+        expected_id = f"{self.protocol}{DOMAIN}/user/mouse"
         self.assertEqual(self.user.remote_id, expected_id)
-        self.assertEqual(self.user.username, "mouse@%s" % DOMAIN)
+        self.assertEqual(self.user.username, f"mouse@{DOMAIN}")
         self.assertEqual(self.user.localname, "mouse")
-        self.assertEqual(self.user.shared_inbox, "https://%s/inbox" % DOMAIN)
-        self.assertEqual(self.user.inbox, "%s/inbox" % expected_id)
-        self.assertEqual(self.user.outbox, "%s/outbox" % expected_id)
+        self.assertEqual(self.user.shared_inbox, f"{self.protocol}{DOMAIN}/inbox")
+        self.assertEqual(self.user.inbox, f"{expected_id}/inbox")
+        self.assertEqual(self.user.outbox, f"{expected_id}/outbox")
+        self.assertEqual(self.user.followers_url, f"{expected_id}/followers")
         self.assertIsNotNone(self.user.key_pair.private_key)
         self.assertIsNotNone(self.user.key_pair.public_key)
 
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
deleted file mode 100644
index 56ba844ad..000000000
--- a/bookwyrm/tests/test_activitystreams.py
+++ /dev/null
@@ -1,362 +0,0 @@
-""" testing activitystreams """
-from unittest.mock import patch
-from django.test import TestCase
-from bookwyrm import activitystreams, models
-
-
-@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
-@patch("bookwyrm.activitystreams.BooksStream.add_book_statuses")
-@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-# pylint: disable=too-many-public-methods
-class Activitystreams(TestCase):
-    """using redis to build activity streams"""
-
-    def setUp(self):
-        """use a test csv"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
-            self.local_user = models.User.objects.create_user(
-                "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
-            )
-            self.another_user = models.User.objects.create_user(
-                "nutria",
-                "nutria@nutria.nutria",
-                "password",
-                local=True,
-                localname="nutria",
-            )
-        with patch("bookwyrm.models.user.set_remote_server.delay"):
-            self.remote_user = models.User.objects.create_user(
-                "rat",
-                "rat@rat.com",
-                "ratword",
-                local=False,
-                remote_id="https://example.com/users/rat",
-                inbox="https://example.com/users/rat/inbox",
-                outbox="https://example.com/users/rat/outbox",
-            )
-        work = models.Work.objects.create(title="test work")
-        self.book = models.Edition.objects.create(title="test book", parent_work=work)
-
-        class TestStream(activitystreams.ActivityStream):
-            """test stream, don't have to do anything here"""
-
-            key = "test"
-
-        self.test_stream = TestStream()
-
-    def test_activitystream_class_ids(self, *_):
-        """the abstract base class for stream objects"""
-        self.assertEqual(
-            self.test_stream.stream_id(self.local_user),
-            "{}-test".format(self.local_user.id),
-        )
-        self.assertEqual(
-            self.test_stream.unread_id(self.local_user),
-            "{}-test-unread".format(self.local_user.id),
-        )
-
-    def test_abstractstream_get_audience(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        users = self.test_stream.get_audience(status)
-        # remote users don't have feeds
-        self.assertFalse(self.remote_user in users)
-        self.assertTrue(self.local_user in users)
-        self.assertTrue(self.another_user in users)
-
-    def test_abstractstream_get_audience_direct(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user,
-            content="hi",
-            privacy="direct",
-        )
-        status.mention_users.add(self.local_user)
-        users = self.test_stream.get_audience(status)
-        self.assertEqual(users, [])
-
-        status = models.Comment.objects.create(
-            user=self.remote_user,
-            content="hi",
-            privacy="direct",
-            book=self.book,
-        )
-        status.mention_users.add(self.local_user)
-        users = self.test_stream.get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-        self.assertFalse(self.remote_user in users)
-
-    def test_abstractstream_get_audience_followers_remote_user(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user,
-            content="hi",
-            privacy="followers",
-        )
-        users = self.test_stream.get_audience(status)
-        self.assertFalse(users.exists())
-
-    def test_abstractstream_get_audience_followers_self(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Comment.objects.create(
-            user=self.local_user,
-            content="hi",
-            privacy="direct",
-            book=self.book,
-        )
-        users = self.test_stream.get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-        self.assertFalse(self.remote_user in users)
-
-    def test_abstractstream_get_audience_followers_with_mention(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Comment.objects.create(
-            user=self.remote_user,
-            content="hi",
-            privacy="direct",
-            book=self.book,
-        )
-        status.mention_users.add(self.local_user)
-
-        users = self.test_stream.get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-        self.assertFalse(self.remote_user in users)
-
-    def test_abstractstream_get_audience_followers_with_relationship(self, *_):
-        """get a list of users that should see a status"""
-        self.remote_user.followers.add(self.local_user)
-        status = models.Comment.objects.create(
-            user=self.remote_user,
-            content="hi",
-            privacy="direct",
-            book=self.book,
-        )
-        users = self.test_stream.get_audience(status)
-        self.assertFalse(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-        self.assertFalse(self.remote_user in users)
-
-    def test_homestream_get_audience(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        users = activitystreams.HomeStream().get_audience(status)
-        self.assertFalse(users.exists())
-
-    def test_homestream_get_audience_with_mentions(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        status.mention_users.add(self.local_user)
-        users = activitystreams.HomeStream().get_audience(status)
-        self.assertFalse(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-
-    def test_homestream_get_audience_with_relationship(self, *_):
-        """get a list of users that should see a status"""
-        self.remote_user.followers.add(self.local_user)
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        users = activitystreams.HomeStream().get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertFalse(self.another_user in users)
-
-    def test_localstream_get_audience_remote_status(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.remote_user, content="hi", privacy="public"
-        )
-        users = activitystreams.LocalStream().get_audience(status)
-        self.assertEqual(users, [])
-
-    def test_localstream_get_audience_local_status(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.local_user, content="hi", privacy="public"
-        )
-        users = activitystreams.LocalStream().get_audience(status)
-        self.assertTrue(self.local_user in users)
-        self.assertTrue(self.another_user in users)
-
-    def test_localstream_get_audience_unlisted(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.local_user, content="hi", privacy="unlisted"
-        )
-        users = activitystreams.LocalStream().get_audience(status)
-        self.assertEqual(users, [])
-
-    def test_localstream_get_audience_books_no_book(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.local_user, content="hi", privacy="public"
-        )
-        audience = activitystreams.BooksStream().get_audience(status)
-        # no books, no audience
-        self.assertEqual(audience, [])
-
-    def test_localstream_get_audience_books_mention_books(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Status.objects.create(
-            user=self.local_user, content="hi", privacy="public"
-        )
-        status.mention_books.add(self.book)
-        status.save(broadcast=False)
-        models.ShelfBook.objects.create(
-            user=self.local_user,
-            shelf=self.local_user.shelf_set.first(),
-            book=self.book,
-        )
-        # yes book, yes audience
-        audience = activitystreams.BooksStream().get_audience(status)
-        self.assertTrue(self.local_user in audience)
-
-    def test_localstream_get_audience_books_book_field(self, *_):
-        """get a list of users that should see a status"""
-        status = models.Comment.objects.create(
-            user=self.local_user, content="hi", privacy="public", book=self.book
-        )
-        models.ShelfBook.objects.create(
-            user=self.local_user,
-            shelf=self.local_user.shelf_set.first(),
-            book=self.book,
-        )
-        # yes book, yes audience
-        audience = activitystreams.BooksStream().get_audience(status)
-        self.assertTrue(self.local_user in audience)
-
-    def test_localstream_get_audience_books_alternate_edition(self, *_):
-        """get a list of users that should see a status"""
-        alt_book = models.Edition.objects.create(
-            title="hi", parent_work=self.book.parent_work
-        )
-        status = models.Comment.objects.create(
-            user=self.remote_user, content="hi", privacy="public", book=alt_book
-        )
-        models.ShelfBook.objects.create(
-            user=self.local_user,
-            shelf=self.local_user.shelf_set.first(),
-            book=self.book,
-        )
-        # yes book, yes audience
-        audience = activitystreams.BooksStream().get_audience(status)
-        self.assertTrue(self.local_user in audience)
-
-    def test_localstream_get_audience_books_non_public(self, *_):
-        """get a list of users that should see a status"""
-        alt_book = models.Edition.objects.create(
-            title="hi", parent_work=self.book.parent_work
-        )
-        status = models.Comment.objects.create(
-            user=self.remote_user, content="hi", privacy="unlisted", book=alt_book
-        )
-        models.ShelfBook.objects.create(
-            user=self.local_user,
-            shelf=self.local_user.shelf_set.first(),
-            book=self.book,
-        )
-        # yes book, yes audience
-        audience = activitystreams.BooksStream().get_audience(status)
-        self.assertEqual(audience, [])
-
-    def test_get_statuses_for_user_books(self, *_):
-        """create a stream for a user"""
-        alt_book = models.Edition.objects.create(
-            title="hi", parent_work=self.book.parent_work
-        )
-        status = models.Status.objects.create(
-            user=self.local_user, content="hi", privacy="public"
-        )
-        status = models.Comment.objects.create(
-            user=self.remote_user, content="hi", privacy="public", book=alt_book
-        )
-        models.ShelfBook.objects.create(
-            user=self.local_user,
-            shelf=self.local_user.shelf_set.first(),
-            book=self.book,
-        )
-        # yes book, yes audience
-        result = activitystreams.BooksStream().get_statuses_for_user(self.local_user)
-        self.assertEqual(list(result), [status])
-
-    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
-    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
-    def test_boost_to_another_timeline(self, *_):
-        """add a boost and deduplicate the boosted status on the timeline"""
-        status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
-            boost = models.Boost.objects.create(
-                boosted_status=status,
-                user=self.another_user,
-            )
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
-        self.assertTrue(mock.called)
-        call_args = mock.call_args
-        self.assertEqual(call_args[0][0], status)
-        self.assertEqual(
-            call_args[1]["stores"], ["{:d}-home".format(self.another_user.id)]
-        )
-
-    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
-    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
-    def test_boost_to_following_timeline(self, *_):
-        """add a boost and deduplicate the boosted status on the timeline"""
-        self.local_user.following.add(self.another_user)
-        status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
-            boost = models.Boost.objects.create(
-                boosted_status=status,
-                user=self.another_user,
-            )
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
-        self.assertTrue(mock.called)
-        call_args = mock.call_args
-        self.assertEqual(call_args[0][0], status)
-        self.assertTrue(
-            "{:d}-home".format(self.another_user.id) in call_args[1]["stores"]
-        )
-        self.assertTrue(
-            "{:d}-home".format(self.local_user.id) in call_args[1]["stores"]
-        )
-
-    @patch("bookwyrm.activitystreams.LocalStream.remove_object_from_related_stores")
-    @patch("bookwyrm.activitystreams.BooksStream.remove_object_from_related_stores")
-    def test_boost_to_same_timeline(self, *_):
-        """add a boost and deduplicate the boosted status on the timeline"""
-        status = models.Status.objects.create(user=self.local_user, content="hi")
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ):
-            boost = models.Boost.objects.create(
-                boosted_status=status,
-                user=self.local_user,
-            )
-        with patch(
-            "bookwyrm.activitystreams.HomeStream.remove_object_from_related_stores"
-        ) as mock:
-            activitystreams.add_status_on_create(models.Boost, boost, True)
-        self.assertTrue(mock.called)
-        call_args = mock.call_args
-        self.assertEqual(call_args[0][0], status)
-        self.assertEqual(
-            call_args[1]["stores"], ["{:d}-home".format(self.local_user.id)]
-        )
diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py
index 4c3d86a46..2f24122ee 100644
--- a/bookwyrm/tests/test_emailing.py
+++ b/bookwyrm/tests/test_emailing.py
@@ -14,7 +14,9 @@ class Emailing(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py
index 37638c27c..f95e623c8 100644
--- a/bookwyrm/tests/test_preview_images.py
+++ b/bookwyrm/tests/test_preview_images.py
@@ -20,6 +20,7 @@ from bookwyrm.preview_images import (
 
 # pylint: disable=unused-argument
 # pylint: disable=missing-function-docstring
+# pylint: disable=consider-using-with
 class PreviewImages(TestCase):
     """every response to a get request, html or json"""
 
@@ -29,7 +30,9 @@ class PreviewImages(TestCase):
         avatar_file = pathlib.Path(__file__).parent.joinpath(
             "../static/images/no_cover.jpg"
         )
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "possum@local.com",
                 "possum@possum.possum",
@@ -118,3 +121,11 @@ class PreviewImages(TestCase):
         self.assertEqual(
             self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT
         )
+
+    def test_generate_user_preview_images_task(self, *args, **kwargs):
+        """test task's external calls"""
+        with patch("bookwyrm.preview_images.generate_preview_image") as generate_mock:
+            generate_user_preview_image_task(self.local_user.id)
+        args = generate_mock.call_args.kwargs
+        self.assertEqual(args["texts"]["text_one"], "possum")
+        self.assertEqual(args["texts"]["text_three"], f"@possum@{settings.DOMAIN}")
diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index d9a87dd56..d33687a59 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -37,7 +37,9 @@ class Signature(TestCase):
 
     def setUp(self):
         """create users and test data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.mouse = models.User.objects.create_user(
                 "mouse@%s" % DOMAIN,
                 "mouse@example.com",
diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py
index 7e4a9d00f..6b794b5dc 100644
--- a/bookwyrm/tests/test_suggested_users.py
+++ b/bookwyrm/tests/test_suggested_users.py
@@ -10,8 +10,10 @@ from bookwyrm.suggested_users import suggested_users, get_annotated_users
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class SuggestedUsers(TestCase):
@@ -19,7 +21,9 @@ class SuggestedUsers(TestCase):
 
     def setUp(self):
         """use a test csv"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
             )
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index d75d368c1..5954ce271 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -15,14 +15,16 @@ from bookwyrm.templatetags import (
 )
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class TemplateTags(TestCase):
     """lotta different things here"""
 
     def setUp(self):
         """create some filler objects"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.mouse",
@@ -73,15 +75,12 @@ class TemplateTags(TestCase):
         second_child = models.Status.objects.create(
             reply_parent=parent, user=self.user, content="hi"
         )
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            third_child = models.Status.objects.create(
-                reply_parent=parent,
-                user=self.user,
-                deleted=True,
-                deleted_date=timezone.now(),
-            )
+        third_child = models.Status.objects.create(
+            reply_parent=parent,
+            user=self.user,
+            deleted=True,
+            deleted_date=timezone.now(),
+        )
 
         replies = status_display.get_replies(parent)
         self.assertEqual(len(replies), 2)
@@ -180,5 +179,5 @@ class TemplateTags(TestCase):
         """self progress helper"""
         self.assertEqual(bookwyrm_tags.get_next_shelf("to-read"), "reading")
         self.assertEqual(bookwyrm_tags.get_next_shelf("reading"), "read")
-        self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "read")
+        self.assertEqual(bookwyrm_tags.get_next_shelf("read"), "complete")
         self.assertEqual(bookwyrm_tags.get_next_shelf("blooooga"), "to-read")
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index 8e49d25a4..47e6a86e7 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -3,6 +3,7 @@ import json
 import pathlib
 from unittest.mock import patch
 
+from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseNotAllowed, HttpResponseNotFound
 from django.test import TestCase, Client
 from django.test.client import RequestFactory
@@ -19,7 +20,9 @@ class Inbox(TestCase):
         self.client = Client()
         self.factory = RequestFactory()
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -128,22 +131,24 @@ class Inbox(TestCase):
             "",
             HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
         )
-        self.assertFalse(views.inbox.is_blocked_user_agent(request))
+        self.assertIsNone(views.inbox.raise_is_blocked_user_agent(request))
 
         models.FederatedServer.objects.create(
             server_name="mastodon.social", status="blocked"
         )
-        self.assertTrue(views.inbox.is_blocked_user_agent(request))
+        with self.assertRaises(PermissionDenied):
+            views.inbox.raise_is_blocked_user_agent(request)
 
     def test_is_blocked_activity(self):
         """check for blocked servers"""
         activity = {"actor": "https://mastodon.social/user/whaatever/else"}
-        self.assertFalse(views.inbox.is_blocked_activity(activity))
+        self.assertIsNone(views.inbox.raise_is_blocked_activity(activity))
 
         models.FederatedServer.objects.create(
             server_name="mastodon.social", status="blocked"
         )
-        self.assertTrue(views.inbox.is_blocked_activity(activity))
+        with self.assertRaises(PermissionDenied):
+            views.inbox.raise_is_blocked_activity(activity)
 
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_create_by_deactivated_user(self, _):
@@ -155,11 +160,11 @@ class Inbox(TestCase):
         activity = self.create_json
         activity["actor"] = self.remote_user.remote_id
         activity["object"] = status_data
+        activity["type"] = "Create"
 
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = True
-
-            result = self.client.post(
-                "/inbox", json.dumps(activity), content_type="application/json"
-            )
-        self.assertEqual(result.status_code, 403)
+        response = self.client.post(
+            "/inbox",
+            json.dumps(activity),
+            content_type="application/json",
+        )
+        self.assertEqual(response.status_code, 403)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 07525c34e..33e6c55b4 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -13,7 +13,9 @@ class InboxAdd(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index 8bc6cd1d0..3a108878c 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -13,7 +13,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -35,7 +37,7 @@ class InboxActivities(TestCase):
             )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            with patch("bookwyrm.activitystreams.add_status_task.delay"):
                 self.status = models.Status.objects.create(
                     user=self.local_user,
                     content="Test status",
@@ -53,9 +55,8 @@ class InboxActivities(TestCase):
 
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
-    def test_boost(self, redis_mock, _):
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    def test_boost(self, _):
         """boost a status"""
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
@@ -71,9 +72,6 @@ class InboxActivities(TestCase):
             discarder.return_value = False
             views.inbox.activity_task(activity)
 
-        # boost added to redis activitystreams
-        self.assertTrue(redis_mock.called)
-
         # boost created of correct status
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status, self.status)
@@ -84,9 +82,8 @@ class InboxActivities(TestCase):
         self.assertEqual(notification.related_status, self.status)
 
     @responses.activate
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
-    def test_boost_remote_status(self, redis_mock, _):
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    def test_boost_remote_status(self, _):
         """boost a status from a remote server"""
         work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
@@ -127,7 +124,6 @@ class InboxActivities(TestCase):
         with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
             discarder.return_value = False
             views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
 
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status.remote_id, "https://remote.com/status/1")
@@ -141,7 +137,7 @@ class InboxActivities(TestCase):
             content="hi",
             user=self.remote_user,
         )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status.save(broadcast=False)
         activity = {
             "type": "Announce",
@@ -158,8 +154,9 @@ class InboxActivities(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Boost.objects.count(), 0)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
+    @patch("bookwyrm.activitystreams.handle_boost_task.delay")
+    @patch("bookwyrm.activitystreams.remove_status_task.delay")
     def test_unboost(self, *_):
         """undo a boost"""
         boost = models.Boost.objects.create(
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index ce650a007..ffd74dbde 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -12,7 +12,9 @@ class InboxBlock(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -54,7 +56,7 @@ class InboxBlock(TestCase):
         }
 
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+            "bookwyrm.activitystreams.remove_user_statuses_task.delay"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
@@ -67,7 +69,8 @@ class InboxBlock(TestCase):
         self.assertFalse(models.UserFollows.objects.exists())
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
-    def test_handle_unblock(self):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_handle_unblock(self, _):
         """unblock a user"""
         self.remote_user.blocks.add(self.local_user)
 
@@ -92,7 +95,7 @@ class InboxBlock(TestCase):
             },
         }
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
+            "bookwyrm.activitystreams.add_user_statuses_task.delay"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 059d05223..3e1a22ae7 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -11,12 +11,15 @@ from bookwyrm.activitypub import ActivitySerializerError
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class InboxCreate(TestCase):
     """readthrough tests"""
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -47,7 +50,6 @@ class InboxCreate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_create_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath(
@@ -61,9 +63,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
 
         status = models.Quotation.objects.get()
         self.assertEqual(
@@ -77,7 +77,6 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_create_comment_with_reading_status(self, *_):
         """the "it justs works" mode"""
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_comment.json")
@@ -90,9 +89,7 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
 
         status = models.Comment.objects.get()
         self.assertEqual(status.remote_id, "https://example.com/user/mouse/comment/6")
@@ -104,7 +101,7 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 1)
 
-    def test_create_status_remote_note_with_mention(self, _):
+    def test_create_status_remote_note_with_mention(self, *_):
         """should only create it under the right circumstances"""
         self.assertFalse(
             models.Notification.objects.filter(user=self.local_user).exists()
@@ -115,9 +112,8 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
+
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.mention_users.first(), self.local_user)
@@ -126,14 +122,13 @@ class InboxCreate(TestCase):
         )
         self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
 
-    def test_create_status_remote_note_with_reply(self, _):
+    def test_create_status_remote_note_with_reply(self, *_):
         """should only create it under the right circumstances"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            parent_status = models.Status.objects.create(
-                user=self.local_user,
-                content="Test status",
-                remote_id="https://example.com/status/1",
-            )
+        parent_status = models.Status.objects.create(
+            user=self.local_user,
+            content="Test status",
+            remote_id="https://example.com/status/1",
+        )
 
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(models.Notification.objects.filter(user=self.local_user))
@@ -145,16 +140,14 @@ class InboxCreate(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.reply_parent, parent_status)
         self.assertTrue(models.Notification.objects.filter(user=self.local_user))
         self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
-    def test_create_rating(self, _):
+    def test_create_rating(self, *_):
         """a remote rating activity"""
         book = models.Edition.objects.create(
             title="Test Book", remote_id="https://example.com/book/1"
@@ -184,14 +177,12 @@ class InboxCreate(TestCase):
             "rating": 3,
             "@context": "https://www.w3.org/ns/activitystreams",
         }
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
         rating = models.ReviewRating.objects.first()
         self.assertEqual(rating.book, book)
         self.assertEqual(rating.rating, 3.0)
 
-    def test_create_list(self, _):
+    def test_create_list(self, *_):
         """a new list"""
         activity = self.create_json
         activity["object"] = {
@@ -215,7 +206,7 @@ class InboxCreate(TestCase):
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
-    def test_create_unsupported_type(self, _):
+    def test_create_unsupported_type(self, *_):
         """ignore activities we know we can't handle"""
         activity = self.create_json
         activity["object"] = {
@@ -225,7 +216,7 @@ class InboxCreate(TestCase):
         # just observer how it doesn't throw an error
         views.inbox.activity_task(activity)
 
-    def test_create_unknown_type(self, _):
+    def test_create_unknown_type(self, *_):
         """ignore activities we know we've never heard of"""
         activity = self.create_json
         activity["object"] = {
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 1566c05a2..dd603352c 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -1,4 +1,4 @@
-""" tests incoming activities"""
+"""tests incoming activities"""
 from datetime import datetime
 from unittest.mock import patch
 
@@ -13,7 +13,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -33,21 +35,13 @@ class InboxActivities(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             self.status = models.Status.objects.create(
                 user=self.remote_user,
                 content="Test status",
                 remote_id="https://example.com/status/1",
             )
 
-        self.create_json = {
-            "id": "hi",
-            "type": "Create",
-            "actor": "hi",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {},
-        }
         models.SiteSettings.objects.create()
 
     def test_delete_status(self):
@@ -61,9 +55,7 @@ class InboxActivities(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -92,9 +84,7 @@ class InboxActivities(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -137,3 +127,30 @@ class InboxActivities(TestCase):
         # nothing happens.
         views.inbox.activity_task(activity)
         self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)
+
+    def test_delete_list(self):
+        """delete a list"""
+        book_list = models.List.objects.create(
+            name="test list",
+            user=self.remote_user,
+            remote_id="https://example.com/list/1",
+        )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/test-user#delete",
+            "type": "Delete",
+            "actor": "https://example.com/users/test-user",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "object": {
+                "id": book_list.remote_id,
+                "owner": self.remote_user.remote_id,
+                "type": "BookList",
+                "totalItems": 0,
+                "first": "",
+                "name": "test list",
+                "to": [],
+                "cc": [],
+            },
+        }
+        views.inbox.activity_task(activity)
+        self.assertFalse(models.List.objects.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index d1a4e0d00..6b629c2f0 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -13,7 +13,9 @@ class InboxRelationships(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -181,7 +183,8 @@ class InboxRelationships(TestCase):
         views.inbox.activity_task(activity)
         self.assertIsNone(self.local_user.followers.first())
 
-    def test_follow_accept(self):
+    @patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
+    def test_follow_accept(self, _):
         """a remote user approved a follow request from local"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
index 56f21e894..db8f1fca8 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_like.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -12,7 +12,9 @@ class InboxActivities(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -34,7 +36,7 @@ class InboxActivities(TestCase):
             )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            with patch("bookwyrm.activitystreams.add_status_task.delay"):
                 self.status = models.Status.objects.create(
                     user=self.local_user,
                     content="Test status",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index 3d64fcb23..cb4e4a16f 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -12,7 +12,9 @@ class InboxRemove(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 4abb0fa0d..ec10f2f81 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -14,7 +14,9 @@ class InboxUpdate(TestCase):
 
     def setUp(self):
         """basic user and book data"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@example.com",
                 "mouse@mouse.com",
@@ -81,7 +83,8 @@ class InboxUpdate(TestCase):
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
-    def test_update_user(self, _):
+    @patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
+    def test_update_user(self, *_):
         """update an existing user"""
         models.UserFollows.objects.create(
             user_subject=self.local_user,
diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
index 16ef81e9c..44b5d5b67 100644
--- a/bookwyrm/tests/views/test_announcements.py
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -13,7 +13,9 @@ class AnnouncementViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 6157b6516..7a0065c9e 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -17,7 +17,9 @@ class AuthorViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 11283869b..f1ec42f03 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -14,7 +14,9 @@ class BlockViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -57,7 +59,7 @@ class BlockViews(TestCase):
 
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_user_statuses"):
+        with patch("bookwyrm.activitystreams.remove_user_statuses_task.delay"):
             view(request, self.remote_user.id)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.local_user)
@@ -72,7 +74,7 @@ class BlockViews(TestCase):
         request = self.factory.post("")
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_user_statuses"):
+        with patch("bookwyrm.activitystreams.add_user_statuses_task.delay"):
             views.block.unblock(request, self.remote_user.id)
 
         self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 2cd50302f..8c423e16a 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -9,6 +9,7 @@ import responses
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.http import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -24,7 +25,9 @@ class BookViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -74,7 +77,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_book_page_statuses(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()
@@ -131,8 +134,8 @@ class BookViews(TestCase):
         request.user = self.local_user
         with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 0)
-        self.assertEqual(result.status_code, 404)
+            with self.assertRaises(Http404):
+                view(request, 0)
 
     def test_book_page_work_id(self):
         """there are so many views, this just makes sure it LOADS"""
diff --git a/bookwyrm/tests/views/test_dashboard.py b/bookwyrm/tests/views/test_dashboard.py
new file mode 100644
index 000000000..6ce30c18c
--- /dev/null
+++ b/bookwyrm/tests/views/test_dashboard.py
@@ -0,0 +1,38 @@
+""" test for app action functionality """
+from unittest.mock import patch
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class DashboardViews(TestCase):
+    """every response to a get request, html or json"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.mouse",
+                "password",
+                local=True,
+                localname="mouse",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_dashboard(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Dashboard.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
index bdda81013..90638b0a6 100644
--- a/bookwyrm/tests/views/test_directory.py
+++ b/bookwyrm/tests/views/test_directory.py
@@ -15,7 +15,9 @@ class DirectoryViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -30,6 +32,7 @@ class DirectoryViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.rerank_user_task.delay")
     def test_directory_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py
index eff62cb6f..4b8927bca 100644
--- a/bookwyrm/tests/views/test_discover.py
+++ b/bookwyrm/tests/views/test_discover.py
@@ -1,7 +1,6 @@
 """ test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import AnonymousUser
-from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -15,7 +14,9 @@ class DiscoverViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -41,7 +42,7 @@ class DiscoverViews(TestCase):
         result.render()
 
     @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_discover_page(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Discover.as_view()
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index df89d5b09..07e54e4e4 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -22,7 +22,9 @@ class EditUserViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -37,7 +39,9 @@ class EditUserViews(TestCase):
             self.book = models.Edition.objects.create(
                 title="test", parent_work=models.Work.objects.create(title="test work")
             )
-            with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"), patch(
+                "bookwyrm.activitystreams.add_book_statuses_task.delay"
+            ):
                 models.ShelfBook.objects.create(
                     book=self.book,
                     user=self.local_user,
diff --git a/bookwyrm/tests/views/test_editions.py b/bookwyrm/tests/views/test_editions.py
index 1bd23ae11..a138f3451 100644
--- a/bookwyrm/tests/views/test_editions.py
+++ b/bookwyrm/tests/views/test_editions.py
@@ -15,7 +15,9 @@ class BookViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -101,7 +103,9 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-    def test_switch_edition(self, _):
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    def test_switch_edition(self, *_):
         """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
         edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
diff --git a/bookwyrm/tests/views/test_email_blocks.py b/bookwyrm/tests/views/test_email_blocks.py
new file mode 100644
index 000000000..be3d9d702
--- /dev/null
+++ b/bookwyrm/tests/views/test_email_blocks.py
@@ -0,0 +1,73 @@
+""" test for app action functionality """
+from unittest.mock import patch
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class EmailBlocklistViews(TestCase):
+    """every response to a get request, html or json"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.mouse",
+                "password",
+                local=True,
+                localname="mouse",
+            )
+
+        models.SiteSettings.objects.create()
+
+    def test_blocklist_page_get(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.EmailBlocklist.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_blocklist_page_post(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.EmailBlocklist.as_view()
+        request = self.factory.post("", {"domain": "gmail.com"})
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        self.assertTrue(
+            models.EmailBlocklist.objects.filter(domain="gmail.com").exists()
+        )
+
+    def test_blocklist_page_delete(self):
+        """there are so many views, this just makes sure it LOADS"""
+        domain = models.EmailBlocklist.objects.create(domain="gmail.com")
+
+        view = views.EmailBlocklist.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request, domain_id=domain.id)
+        self.assertEqual(result.status_code, 302)
+
+        self.assertFalse(
+            models.EmailBlocklist.objects.filter(domain="gmail.com").exists()
+        )
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index f43a9623e..ebd311d3f 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -15,7 +15,9 @@ class FederationViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -73,12 +75,14 @@ class FederationViews(TestCase):
 
         self.assertEqual(server.status, "federated")
 
-        view = views.federation.block_server
+        view = views.block_server
         request = self.factory.post("")
         request.user = self.local_user
         request.user.is_superuser = True
 
-        view(request, server.id)
+        with patch("bookwyrm.suggested_users.bulk_remove_instance_task.delay") as mock:
+            view(request, server.id)
+        self.assertEqual(mock.call_count, 1)
 
         server.refresh_from_db()
         self.remote_user.refresh_from_db()
@@ -116,7 +120,11 @@ class FederationViews(TestCase):
         request.user = self.local_user
         request.user.is_superuser = True
 
-        views.federation.unblock_server(request, server.id)
+        with patch("bookwyrm.suggested_users.bulk_add_instance_task.delay") as mock:
+            views.unblock_server(request, server.id)
+        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(mock.call_args[0][0], server.id)
+
         server.refresh_from_db()
         self.remote_user.refresh_from_db()
         self.assertEqual(server.status, "federated")
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 666c3e02b..a6f220b58 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -5,6 +5,7 @@ import pathlib
 
 from PIL import Image
 from django.core.files.base import ContentFile
+from django.http import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -15,8 +16,9 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.suggested_users.remove_user_task.delay")
 class FeedViews(TestCase):
     """activity feed, statuses, dms"""
@@ -24,7 +26,9 @@ class FeedViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -78,9 +82,28 @@ class FeedViews(TestCase):
         request.user = self.local_user
         with patch("bookwyrm.views.feed.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, "mouse", 12345)
+            with self.assertRaises(Http404):
+                view(request, "mouse", 12345)
 
-        self.assertEqual(result.status_code, 404)
+    def test_status_page_not_found_wrong_user(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Status.as_view()
+        another_user = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@rat.rat",
+            "password",
+            local=True,
+            localname="rat",
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=another_user)
+
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
+            is_api.return_value = False
+            with self.assertRaises(Http404):
+                view(request, "mouse", status.id)
 
     def test_status_page_with_image(self, *_):
         """there are so many views, this just makes sure it LOADS"""
@@ -148,14 +171,15 @@ class FeedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
     def test_get_suggested_book(self, *_):
         """gets books the ~*~ algorithm ~*~ thinks you want to post about"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ShelfBook.objects.create(
-                book=self.book,
-                user=self.local_user,
-                shelf=self.local_user.shelf_set.get(identifier="reading"),
-            )
+        models.ShelfBook.objects.create(
+            book=self.book,
+            user=self.local_user,
+            shelf=self.local_user.shelf_set.get(identifier="reading"),
+        )
         suggestions = views.feed.get_suggested_books(self.local_user)
         self.assertEqual(suggestions[0]["name"], "Currently Reading")
         self.assertEqual(suggestions[0]["books"][0], self.book)
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 714284b01..947c55cf0 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -10,13 +10,16 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 
 
+@patch("bookwyrm.activitystreams.add_user_statuses_task.delay")
 class FollowViews(TestCase):
     """follows"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -50,7 +53,7 @@ class FollowViews(TestCase):
             parent_work=self.work,
         )
 
-    def test_handle_follow_remote(self):
+    def test_handle_follow_remote(self, _):
         """send a follow request"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
@@ -65,9 +68,11 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, self.remote_user)
         self.assertEqual(rel.status, "follow_request")
 
-    def test_handle_follow_local_manually_approves(self):
+    def test_handle_follow_local_manually_approves(self, _):
         """send a follow request"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             rat = models.User.objects.create_user(
                 "rat@local.com",
                 "rat@rat.com",
@@ -89,9 +94,11 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, rat)
         self.assertEqual(rel.status, "follow_request")
 
-    def test_handle_follow_local(self):
+    def test_handle_follow_local(self, _):
         """send a follow request"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             rat = models.User.objects.create_user(
                 "rat@local.com",
                 "rat@rat.com",
@@ -113,7 +120,8 @@ class FollowViews(TestCase):
         self.assertEqual(rel.user_object, rat)
         self.assertEqual(rel.status, "follows")
 
-    def test_handle_unfollow(self):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_handle_unfollow(self, *_):
         """send an unfollow"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
@@ -127,7 +135,7 @@ class FollowViews(TestCase):
 
         self.assertEqual(self.remote_user.followers.count(), 0)
 
-    def test_handle_accept(self):
+    def test_handle_accept(self, _):
         """accept a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
@@ -146,7 +154,7 @@ class FollowViews(TestCase):
         # follow relationship should exist
         self.assertEqual(self.local_user.followers.first(), self.remote_user)
 
-    def test_handle_reject(self):
+    def test_handle_reject(self, _):
         """reject a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index eb9d67b5d..135896dc2 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -7,13 +7,16 @@ from django.test.client import RequestFactory
 from bookwyrm import forms, models, views
 
 
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 class GetStartedViews(TestCase):
     """helping new users get oriented"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -31,7 +34,7 @@ class GetStartedViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_profile_view(self):
+    def test_profile_view(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedProfile.as_view()
         request = self.factory.get("")
@@ -63,7 +66,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(self.local_user.name, "New Name")
         self.assertTrue(self.local_user.discoverable)
 
-    def test_books_view(self):
+    def test_books_view(self, _):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("")
@@ -75,7 +78,7 @@ class GetStartedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_books_view_with_query(self):
+    def test_books_view_with_query(self, _):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("?query=Example")
@@ -88,7 +91,8 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-    def test_books_view_post(self, _):
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    def test_books_view_post(self, *_):
         """shelve some books"""
         view = views.GetStartedBooks.as_view()
         data = {self.book.id: self.local_user.shelf_set.first().id}
@@ -107,7 +111,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(shelfbook.user, self.local_user)
 
     @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions")
-    def test_users_view(self, _):
+    def test_users_view(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("")
@@ -120,7 +124,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions")
-    def test_users_view_with_query(self, _):
+    def test_users_view_with_query(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("?query=rat")
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index 23bd8e1a8..cb8c5d8e8 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -3,6 +3,7 @@ from unittest.mock import patch
 from django.utils import timezone
 
 from django.contrib.auth.models import AnonymousUser
+from django.http import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -16,7 +17,9 @@ class GoalViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -101,10 +104,10 @@ class GoalViews(TestCase):
         request = self.factory.get("")
         request.user = self.rat
 
-        result = view(request, self.local_user.localname, self.year)
-        self.assertEqual(result.status_code, 404)
+        with self.assertRaises(Http404):
+            view(request, self.local_user.localname, self.year)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_create_goal(self, _):
         """create a new goal"""
         view = views.Goal.as_view()
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index b9a82e681..8f7b45a35 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -11,8 +11,9 @@ from bookwyrm import models, views
 from bookwyrm.settings import USER_AGENT
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.suggested_users.rerank_user_task.delay")
 class ViewsHelpers(TestCase):
     """viewing and creating statuses"""
@@ -20,7 +21,9 @@ class ViewsHelpers(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             with patch("bookwyrm.suggested_users.rerank_user_task.delay"):
                 self.local_user = models.User.objects.create_user(
                     "mouse@local.com",
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index d9d67d568..2027d2845 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -15,7 +15,9 @@ class ImportViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index d83fc1190..e8b9353ed 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -8,14 +8,16 @@ from bookwyrm import models, views
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
-@patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 class InteractionViews(TestCase):
     """viewing and creating statuses"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -47,7 +49,7 @@ class InteractionViews(TestCase):
         view = views.Favorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -65,7 +67,7 @@ class InteractionViews(TestCase):
         view = views.Unfavorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Favorite.as_view()(request, status.id)
 
@@ -82,7 +84,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -104,7 +106,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             with patch(
@@ -128,7 +130,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="unlisted"
             )
@@ -143,7 +145,7 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="followers"
             )
@@ -156,14 +158,14 @@ class InteractionViews(TestCase):
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    @patch("bookwyrm.activitystreams.add_status_task.delay")
     def test_unboost(self, *_):
         """undo a boost"""
         view = views.Unboost.as_view()
@@ -171,17 +173,12 @@ class InteractionViews(TestCase):
         request.user = self.remote_user
         status = models.Status.objects.create(user=self.local_user, content="hi")
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ):
-            views.Boost.as_view()(request, status.id)
+        views.Boost.as_view()(request, status.id)
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            view(request, status.id)
-            self.assertTrue(redis_mock.called)
+
+        view(request, status.id)
+
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index 6ad464208..c1e425c8c 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -16,7 +16,9 @@ class InviteViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
index 7c413e8bf..a6a451748 100644
--- a/bookwyrm/tests/views/test_isbn.py
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -16,7 +16,9 @@ class IsbnViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 476da74b1..f3a50fbc2 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -15,7 +15,9 @@ class LandingViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index d5e917c38..35befec6b 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -17,7 +17,9 @@ class ListViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
index 2339427c6..f7775d19f 100644
--- a/bookwyrm/tests/views/test_list_actions.py
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -3,6 +3,7 @@ import json
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
+from django.core.exceptions import PermissionDenied
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -15,7 +16,9 @@ class ListActionViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -66,6 +69,44 @@ class ListActionViews(TestCase):
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
+    def test_delete_list(self):
+        """delete an entire list"""
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book_two,
+                approved=False,
+                order=2,
+            )
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.delete_list(request, self.list.id)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["id"], self.list.remote_id)
+        self.assertEqual(activity["object"]["type"], "BookList")
+
+        self.assertEqual(mock.call_count, 1)
+        self.assertFalse(models.List.objects.exists())
+        self.assertFalse(models.ListItem.objects.exists())
+
+    def test_delete_list_permission_denied(self):
+        """delete an entire list"""
+        request = self.factory.post("")
+        request.user = self.rat
+        with self.assertRaises(PermissionDenied):
+            views.delete_list(request, self.list.id)
+
     def test_curate_approve(self):
         """approve a pending item"""
         view = views.Curate.as_view()
@@ -527,5 +568,6 @@ class ListActionViews(TestCase):
         )
         request.user = self.rat
 
-        views.list.remove_book(request, self.list.id)
+        with self.assertRaises(PermissionDenied):
+            views.list.remove_book(request, self.list.id)
         self.assertTrue(self.list.listitem_set.exists())
diff --git a/bookwyrm/tests/views/test_login.py b/bookwyrm/tests/views/test_login.py
new file mode 100644
index 000000000..c37eaa514
--- /dev/null
+++ b/bookwyrm/tests/views/test_login.py
@@ -0,0 +1,110 @@
+""" test for app action functionality """
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import forms, models, views
+
+
+# pylint: disable=too-many-public-methods
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class LoginViews(TestCase):
+    """login and password management"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
+            self.local_user = models.User.objects.create_user(
+                "mouse@your.domain.here",
+                "mouse@mouse.com",
+                "password",
+                local=True,
+                localname="mouse",
+            )
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+        models.SiteSettings.objects.create(id=1, require_confirm_email=False)
+
+    def test_login_get(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        login = views.Login.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = login(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        request.user = self.local_user
+        result = login(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_localname(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse@mouse.com"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.login.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_username(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse@your.domain.here"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.login.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_email(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse"
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.login.login"):
+            result = view(request)
+        self.assertEqual(result.url, "/")
+        self.assertEqual(result.status_code, 302)
+
+    def test_login_post_invalid_credentials(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Login.as_view()
+        form = forms.LoginForm()
+        form.data["localname"] = "mouse"
+        form.data["password"] = "passsword1"
+        request = self.factory.post("", form.data)
+        request.user = self.anonymous_user
+
+        with patch("bookwyrm.views.login.login"):
+            result = view(request)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+        self.assertEqual(
+            result.context_data["login_form"].non_field_errors,
+            "Username or password are incorrect",
+        )
diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py
index af6aac13e..d97616ce9 100644
--- a/bookwyrm/tests/views/test_notifications.py
+++ b/bookwyrm/tests/views/test_notifications.py
@@ -14,7 +14,9 @@ class NotificationViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index fe493bb87..a1f62cc61 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -18,7 +18,9 @@ class OutboxView(TestCase):
     def setUp(self):
         """we'll need some data"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -56,7 +58,7 @@ class OutboxView(TestCase):
 
     def test_outbox_privacy(self, _):
         """don't show dms et cetera in outbox"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Status.objects.create(
                 content="PRIVATE!!", user=self.local_user, privacy="direct"
             )
@@ -79,7 +81,7 @@ class OutboxView(TestCase):
 
     def test_outbox_filter(self, _):
         """if we only care about reviews, only get reviews"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 content="look at this",
                 name="hi",
@@ -105,7 +107,7 @@ class OutboxView(TestCase):
 
     def test_outbox_bookwyrm_request_true(self, _):
         """should differentiate between bookwyrm and outside requests"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",
@@ -123,7 +125,7 @@ class OutboxView(TestCase):
 
     def test_outbox_bookwyrm_request_false(self, _):
         """should differentiate between bookwyrm and outside requests"""
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 5f59e9e32..3a1b591dd 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -15,7 +15,9 @@ class PasswordViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -41,12 +43,14 @@ class PasswordViews(TestCase):
     def test_password_reset_request_post(self):
         """send 'em an email"""
         request = self.factory.post("", {"email": "aa@bb.ccc"})
+        request.user = self.anonymous_user
         view = views.PasswordResetRequest.as_view()
         resp = view(request)
         self.assertEqual(resp.status_code, 200)
         resp.render()
 
         request = self.factory.post("", {"email": "mouse@mouse.com"})
+        request.user = self.anonymous_user
         with patch("bookwyrm.emailing.send_email.delay"):
             resp = view(request)
         resp.render()
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index bebd9f5a9..52d10aa6a 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -8,15 +8,19 @@ from django.utils import timezone
 from bookwyrm import models, views
 
 
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 class ReadingViews(TestCase):
     """viewing and creating statuses"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -73,7 +77,9 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-    def test_start_reading_reshelf(self, *_):
+    @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+    @patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
+    def test_start_reading_reshelve(self, *_):
         """begin a book"""
         to_read_shelf = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -107,7 +113,8 @@ class ReadingViews(TestCase):
             {
                 "post-status": True,
                 "privacy": "followers",
-                "finish_date": "2020-01-07",
+                "start_date": readthrough.start_date,
+                "finish_date": timezone.now().isoformat(),
                 "id": readthrough.id,
             },
         )
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 618d9cf87..ef149ce30 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -8,7 +8,10 @@ from bookwyrm import models
 
 
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class ReadThrough(TestCase):
     """readthrough tests"""
 
@@ -22,7 +25,9 @@ class ReadThrough(TestCase):
             title="Example Edition", parent_work=self.work
         )
 
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.user = models.User.objects.create_user(
                 "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco"
             )
@@ -30,7 +35,8 @@ class ReadThrough(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.client.force_login(self.user)
 
-    def test_create_basic_readthrough(self, delay_mock, _):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_create_basic_readthrough(self, *_):
         """A basic readthrough doesn't create a progress update"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
@@ -49,9 +55,9 @@ class ReadThrough(TestCase):
         )
         self.assertEqual(readthroughs[0].progress, None)
         self.assertEqual(readthroughs[0].finish_date, None)
-        self.assertEqual(delay_mock.call_count, 1)
 
-    def test_create_progress_readthrough(self, delay_mock, _):
+    @patch("bookwyrm.activitystreams.remove_user_statuses_task.delay")
+    def test_create_progress_readthrough(self, *_):
         """a readthrough with progress"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
@@ -86,8 +92,6 @@ class ReadThrough(TestCase):
         self.assertEqual(progress_updates[0].progress, 100)
 
         # Edit doesn't publish anything
-        self.assertEqual(delay_mock.call_count, 1)
-
         self.client.post(
             "/delete-readthrough",
             {
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_register.py
similarity index 73%
rename from bookwyrm/tests/views/test_authentication.py
rename to bookwyrm/tests/views/test_register.py
index 22008e100..764081ef9 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_register.py
@@ -8,19 +8,22 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import forms, models, views
+from bookwyrm import models, views
 from bookwyrm.settings import DOMAIN
 
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-class AuthenticationViews(TestCase):
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+class RegisterViews(TestCase):
     """login and password management"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@your.domain.here",
                 "mouse@mouse.com",
@@ -35,83 +38,7 @@ class AuthenticationViews(TestCase):
             id=1, require_confirm_email=False
         )
 
-    def test_login_get(self, _):
-        """there are so many views, this just makes sure it LOADS"""
-        login = views.Login.as_view()
-        request = self.factory.get("")
-        request.user = self.anonymous_user
-
-        result = login(request)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-
-        request.user = self.local_user
-        result = login(request)
-        self.assertEqual(result.url, "/")
-        self.assertEqual(result.status_code, 302)
-
-    def test_login_post_localname(self, _):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Login.as_view()
-        form = forms.LoginForm()
-        form.data["localname"] = "mouse@mouse.com"
-        form.data["password"] = "password"
-        request = self.factory.post("", form.data)
-        request.user = self.anonymous_user
-
-        with patch("bookwyrm.views.authentication.login"):
-            result = view(request)
-        self.assertEqual(result.url, "/")
-        self.assertEqual(result.status_code, 302)
-
-    def test_login_post_username(self, _):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Login.as_view()
-        form = forms.LoginForm()
-        form.data["localname"] = "mouse@your.domain.here"
-        form.data["password"] = "password"
-        request = self.factory.post("", form.data)
-        request.user = self.anonymous_user
-
-        with patch("bookwyrm.views.authentication.login"):
-            result = view(request)
-        self.assertEqual(result.url, "/")
-        self.assertEqual(result.status_code, 302)
-
-    def test_login_post_email(self, _):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Login.as_view()
-        form = forms.LoginForm()
-        form.data["localname"] = "mouse"
-        form.data["password"] = "password"
-        request = self.factory.post("", form.data)
-        request.user = self.anonymous_user
-
-        with patch("bookwyrm.views.authentication.login"):
-            result = view(request)
-        self.assertEqual(result.url, "/")
-        self.assertEqual(result.status_code, 302)
-
-    def test_login_post_invalid_credentials(self, _):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Login.as_view()
-        form = forms.LoginForm()
-        form.data["localname"] = "mouse"
-        form.data["password"] = "passsword1"
-        request = self.factory.post("", form.data)
-        request.user = self.anonymous_user
-
-        with patch("bookwyrm.views.authentication.login"):
-            result = view(request)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-        self.assertEqual(
-            result.context_data["login_form"].non_field_errors,
-            "Username or password are incorrect",
-        )
-
-    def test_register(self, _):
+    def test_register(self, *_):
         """create a user"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -123,7 +50,7 @@ class AuthenticationViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -148,7 +75,7 @@ class AuthenticationViews(TestCase):
                 "email": "aa@bb.cccc",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.register.login"):
             response = view(request)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.get(localname="nutria")
@@ -159,14 +86,14 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.deactivation_reason, "pending")
         self.assertIsNotNone(nutria.confirmation_code)
 
-    def test_register_trailing_space(self, _):
+    def test_register_trailing_space(self, *_):
         """django handles this so weirdly"""
         view = views.Register.as_view()
         request = self.factory.post(
             "register/",
             {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"},
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -175,7 +102,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.localname, "nutria")
         self.assertEqual(nutria.local, True)
 
-    def test_register_invalid_email(self, _):
+    def test_register_invalid_email(self, *_):
         """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -186,7 +113,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
-    def test_register_invalid_username(self, _):
+    def test_register_invalid_username(self, *_):
         """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
@@ -214,7 +141,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
-    def test_register_closed_instance(self, _):
+    def test_register_closed_instance(self, *_):
         """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
@@ -226,7 +153,31 @@ class AuthenticationViews(TestCase):
         with self.assertRaises(PermissionDenied):
             view(request)
 
-    def test_register_invite(self, _):
+    def test_register_blocked_domain(self, *_):
+        """you can't register with a blocked domain"""
+        view = views.Register.as_view()
+        models.EmailBlocklist.objects.create(domain="gmail.com")
+
+        # one that fails
+        request = self.factory.post(
+            "register/",
+            {"localname": "nutria ", "password": "mouseword", "email": "aa@gmail.com"},
+        )
+        result = view(request)
+        self.assertEqual(result.status_code, 302)
+        self.assertFalse(models.User.objects.filter(email="aa@gmail.com").exists())
+
+        # one that succeeds
+        request = self.factory.post(
+            "register/",
+            {"localname": "nutria ", "password": "mouseword", "email": "aa@bleep.com"},
+        )
+        with patch("bookwyrm.views.register.login"):
+            result = view(request)
+        self.assertEqual(result.status_code, 302)
+        self.assertTrue(models.User.objects.filter(email="aa@bleep.com").exists())
+
+    def test_register_invite(self, *_):
         """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
@@ -245,7 +196,7 @@ class AuthenticationViews(TestCase):
                 "invite_code": "testcode",
             },
         )
-        with patch("bookwyrm.views.authentication.login"):
+        with patch("bookwyrm.views.register.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -279,7 +230,7 @@ class AuthenticationViews(TestCase):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
 
-    def test_confirm_email_code_get(self, _):
+    def test_confirm_email_code_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
@@ -308,7 +259,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-    def test_confirm_email_code_get_invalid_code(self, _):
+    def test_confirm_email_code_get_invalid_code(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
@@ -331,7 +282,7 @@ class AuthenticationViews(TestCase):
         self.assertFalse(self.local_user.is_active)
         self.assertEqual(self.local_user.deactivation_reason, "pending")
 
-    def test_confirm_email_get(self, _):
+    def test_confirm_email_get(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         self.settings.require_confirm_email = True
         self.settings.save()
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 7d39a0076..9fbeae04a 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -13,7 +14,9 @@ class ReportViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -117,6 +120,7 @@ class ReportViews(TestCase):
         self.assertFalse(report.resolved)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_suspend_user(self, *_):
         """toggle whether a user is able to log in"""
@@ -131,6 +135,26 @@ class ReportViews(TestCase):
         self.assertFalse(self.rat.is_active)
 
         # re-activate
-        views.suspend_user(request, self.rat.id)
+        views.unsuspend_user(request, self.rat.id)
         self.rat.refresh_from_db()
         self.assertTrue(self.rat.is_active)
+
+    @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    @patch("bookwyrm.suggested_users.remove_user_task.delay")
+    def test_delete_user(self, *_):
+        """toggle whether a user is able to log in"""
+        self.assertTrue(self.rat.is_active)
+        request = self.factory.post("", {"password": "password"})
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        # de-activate
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.moderator_delete_user(request, self.rat.id)
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Delete")
+
+        self.rat.refresh_from_db()
+        self.assertFalse(self.rat.is_active)
+        self.assertEqual(self.rat.deactivation_reason, "moderator_deletion")
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index f2d3baf2d..d4d112618 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -8,12 +8,14 @@ from bookwyrm.views import rss_feed
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
-@patch("bookwyrm.activitystreams.ActivityStream.add_status")
+@patch("bookwyrm.activitystreams.add_status_task.delay")
 class RssFeedView(TestCase):
     """rss feed behaves as expected"""
 
     def setUp(self):
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "rss_user", "rss@test.rss", "password", local=True
             )
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 3da6f866b..dacbcbded 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -19,7 +19,9 @@ class Views(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 44c4b9cb5..0d7d01cbc 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -11,13 +11,18 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
 class ShelfViews(TestCase):
     """tag views"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -100,7 +105,7 @@ class ShelfViews(TestCase):
         shelf.refresh_from_db()
 
         self.assertEqual(shelf.name, "cool name")
-        self.assertEqual(shelf.identifier, "testshelf-%d" % shelf.id)
+        self.assertEqual(shelf.identifier, f"testshelf-{shelf.id}")
 
     def test_edit_shelf_name_not_editable(self, *_):
         """can't change the name of an non-editable shelf"""
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index d4edee0b3..6a09807c7 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -1,6 +1,7 @@
 """ test for app action functionality """
 import json
 from unittest.mock import patch
+from django.core.exceptions import PermissionDenied
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -10,6 +11,8 @@ from bookwyrm.settings import DOMAIN
 
 # pylint: disable=invalid-name
 @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.remove_status_task.delay")
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class StatusViews(TestCase):
     """viewing and creating statuses"""
@@ -17,7 +20,9 @@ class StatusViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.com",
@@ -59,9 +64,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
 
         status = models.Comment.objects.get()
         self.assertEqual(status.content, "<p>hi</p>")
@@ -74,10 +77,9 @@ class StatusViews(TestCase):
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
         )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            parent = models.Status.objects.create(
-                content="parent status", user=self.local_user
-            )
+        parent = models.Status.objects.create(
+            content="parent status", user=self.local_user
+        )
         form = forms.ReplyForm(
             {
                 "content": "hi",
@@ -89,9 +91,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            view(request, "reply")
-            self.assertTrue(redis_mock.called)
+        view(request, "reply")
 
         status = models.Status.objects.get(user=user)
         self.assertEqual(status.content, "<p>hi</p>")
@@ -102,7 +102,7 @@ class StatusViews(TestCase):
         """@mention a user in a post"""
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
-            "rat@%s" % DOMAIN,
+            f"rat@{DOMAIN}",
             "rat@rat.com",
             "password",
             local=True,
@@ -119,15 +119,13 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
 
         status = models.Status.objects.get()
         self.assertEqual(list(status.mention_users.all()), [user])
         self.assertEqual(models.Notification.objects.get().user, user)
         self.assertEqual(
-            status.content, '<p>hi <a href="%s">@rat</a></p>' % user.remote_id
+            status.content, f'<p>hi <a href="{user.remote_id}">@rat</a></p>'
         )
 
     def test_handle_status_reply_with_mentions(self, *_):
@@ -147,9 +145,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            view(request, "comment")
-            self.assertTrue(redis_mock.called)
+        view(request, "comment")
         status = models.Status.objects.get()
 
         form = forms.ReplyForm(
@@ -163,9 +159,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            view(request, "reply")
-            self.assertTrue(redis_mock.called)
+        view(request, "reply")
 
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, "<p>right</p>")
@@ -179,14 +173,11 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            status = models.Comment.objects.create(
-                content="hi", book=self.book, user=self.local_user
-            )
+        status = models.Comment.objects.create(
+            content="hi", book=self.book, user=self.local_user
+        )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
             result = view(request, status.id)
             self.assertTrue(mock.called)
         result.render()
@@ -200,17 +191,15 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.ReviewRating.objects.create(
                 book=self.book, rating=2.0, user=self.local_user
             )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
-            result = view(request, status.id)
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
+            with self.assertRaises(PermissionDenied):
+                view(request, status.id)
             self.assertFalse(mock.called)
-        self.assertEqual(result.status_code, 400)
 
         status.refresh_from_db()
         self.assertFalse(status.deleted)
@@ -220,17 +209,15 @@ class StatusViews(TestCase):
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.GeneratedNote.objects.create(
                 content="hi", user=self.local_user
             )
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as mock:
-            result = view(request, status.id)
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as mock:
+            with self.assertRaises(PermissionDenied):
+                view(request, status.id)
             self.assertFalse(mock.called)
-        self.assertEqual(result.status_code, 400)
 
         status.refresh_from_db()
         self.assertFalse(status.deleted)
@@ -238,13 +225,13 @@ class StatusViews(TestCase):
     def test_find_mentions(self, *_):
         """detect and look up @ mentions of users"""
         user = models.User.objects.create_user(
-            "nutria@%s" % DOMAIN,
+            f"nutria@{DOMAIN}",
             "nutria@nutria.com",
             "password",
             local=True,
             localname="nutria",
         )
-        self.assertEqual(user.username, "nutria@%s" % DOMAIN)
+        self.assertEqual(user.username, f"nutria@{DOMAIN}")
 
         self.assertEqual(
             list(views.status.find_mentions("@nutria"))[0], ("@nutria", user)
@@ -277,31 +264,65 @@ class StatusViews(TestCase):
             self.assertEqual(list(views.status.find_mentions("@beep@beep.com")), [])
 
         self.assertEqual(
-            list(views.status.find_mentions("@nutria@%s" % DOMAIN))[0],
-            ("@nutria@%s" % DOMAIN, user),
+            list(views.status.find_mentions(f"@nutria@{DOMAIN}"))[0],
+            (f"@nutria@{DOMAIN}", user),
         )
 
-    def test_format_links(self, *_):
+    def test_format_links_simple_url(self, *_):
         """find and format urls into a tags"""
         url = "http://www.fish.com/"
         self.assertEqual(
-            views.status.format_links(url), '<a href="%s">www.fish.com/</a>' % url
+            views.status.format_links(url), f'<a href="{url}">www.fish.com/</a>'
         )
         self.assertEqual(
-            views.status.format_links("(%s)" % url),
-            '(<a href="%s">www.fish.com/</a>)' % url,
+            views.status.format_links(f"({url})"),
+            f'(<a href="{url}">www.fish.com/</a>)',
         )
+
+    def test_format_links_paragraph_break(self, *_):
+        """find and format urls into a tags"""
+        url = """okay
+
+http://www.fish.com/"""
+        self.assertEqual(
+            views.status.format_links(url),
+            'okay\n\n<a href="http://www.fish.com/">www.fish.com/</a>',
+        )
+
+    def test_format_links_parens(self, *_):
+        """find and format urls into a tags"""
+        url = "http://www.fish.com/"
+        self.assertEqual(
+            views.status.format_links(f"({url})"),
+            f'(<a href="{url}">www.fish.com/</a>)',
+        )
+
+    def test_format_links_special_chars(self, *_):
+        """find and format urls into a tags"""
         url = "https://archive.org/details/dli.granth.72113/page/n25/mode/2up"
         self.assertEqual(
             views.status.format_links(url),
-            '<a href="%s">'
-            "archive.org/details/dli.granth.72113/page/n25/mode/2up</a>" % url,
+            f'<a href="{url}">'
+            "archive.org/details/dli.granth.72113/page/n25/mode/2up</a>",
         )
         url = "https://openlibrary.org/search?q=arkady+strugatsky&mode=everything"
         self.assertEqual(
             views.status.format_links(url),
-            '<a href="%s">openlibrary.org/search'
-            "?q=arkady+strugatsky&mode=everything</a>" % url,
+            f'<a href="{url}">openlibrary.org/search'
+            "?q=arkady+strugatsky&mode=everything</a>",
+        )
+        url = "https://tech.lgbt/@bookwyrm"
+        self.assertEqual(
+            views.status.format_links(url), f'<a href="{url}">tech.lgbt/@bookwyrm</a>'
+        )
+        url = "https://users.speakeasy.net/~lion/nb/book.pdf"
+        self.assertEqual(
+            views.status.format_links(url),
+            f'<a href="{url}">users.speakeasy.net/~lion/nb/book.pdf</a>',
+        )
+        url = "https://pkm.one/#/page/The%20Book%20launched%20a%201000%20Note%20apps"
+        self.assertEqual(
+            views.status.format_links(url), f'<a href="{url}">{url[8:]}</a>'
         )
 
     def test_to_markdown(self, *_):
@@ -331,15 +352,13 @@ class StatusViews(TestCase):
     def test_handle_delete_status(self, mock, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.local_user
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
         activity = json.loads(mock.call_args_list[1][0][1])
@@ -351,30 +370,29 @@ class StatusViews(TestCase):
     def test_handle_delete_status_permission_denied(self, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
 
-        view(request, status.id)
+        with self.assertRaises(PermissionDenied):
+            view(request, status.id)
 
         status.refresh_from_db()
         self.assertFalse(status.deleted)
 
-    def test_handle_delete_status_moderator(self, mock, _):
+    def test_handle_delete_status_moderator(self, mock, *_):
         """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch("bookwyrm.activitystreams.add_status_task.delay"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
         request.user.is_superuser = True
 
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
+        with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
         activity = json.loads(mock.call_args_list[1][0][1])
diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
index 627b756e7..27181fc95 100644
--- a/bookwyrm/tests/views/test_updates.py
+++ b/bookwyrm/tests/views/test_updates.py
@@ -15,7 +15,9 @@ class UpdateViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 740f0d299..614f772d7 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -17,7 +17,9 @@ class UserViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -31,13 +33,14 @@ class UserViews(TestCase):
         self.book = models.Edition.objects.create(
             title="test", parent_work=models.Work.objects.create(title="test work")
         )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
-                models.ShelfBook.objects.create(
-                    book=self.book,
-                    user=self.local_user,
-                    shelf=self.local_user.shelf_set.first(),
-                )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"), patch(
+            "bookwyrm.suggested_users.rerank_suggestions_task.delay"
+        ), patch("bookwyrm.activitystreams.add_book_statuses_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book,
+                user=self.local_user,
+                shelf=self.local_user.shelf_set.first(),
+            )
 
         models.SiteSettings.objects.create()
         self.anonymous_user = AnonymousUser
@@ -99,7 +102,8 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
-    def test_followers_page_blocked(self, _):
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    def test_followers_page_blocked(self, *_):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Followers.as_view()
         request = self.factory.get("")
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index 86309045d..3917a6fd9 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -14,7 +14,9 @@ class UserAdminViews(TestCase):
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -49,6 +51,7 @@ class UserAdminViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
     @patch("bookwyrm.suggested_users.remove_user_task.delay")
     def test_user_admin_page_post(self, *_):
         """set the user's group"""
diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
index 4a3eb579f..ecb6a67a5 100644
--- a/bookwyrm/tests/views/test_wellknown.py
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -10,13 +10,15 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 
 
-class UserViews(TestCase):
+class WellknownViews(TestCase):
     """view user and edit profile"""
 
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ):
             self.local_user = models.User.objects.create_user(
                 "mouse@local.com",
                 "mouse@mouse.mouse",
@@ -51,6 +53,16 @@ class UserViews(TestCase):
         data = json.loads(result.getvalue())
         self.assertEqual(data["subject"], "acct:mouse@local.com")
 
+    def test_webfinger_case_sensitivty(self):
+        """ensure that webfinger queries are not case sensitive"""
+        request = self.factory.get("", {"resource": "acct:MoUsE@local.com"})
+        request.user = self.anonymous_user
+
+        result = views.webfinger(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["subject"], "acct:mouse@local.com")
+
     def test_nodeinfo_pointer(self):
         """just tells you where nodeinfo is"""
         request = self.factory.get("")
@@ -83,3 +95,22 @@ class UserViews(TestCase):
         self.assertIsInstance(result, JsonResponse)
         self.assertEqual(data["stats"]["user_count"], 2)
         self.assertEqual(models.User.objects.count(), 3)
+
+    def test_peers(self):
+        """who's federating with whom"""
+        models.FederatedServer.objects.create(
+            server_name="test.server",
+            status="federated",
+        )
+        models.FederatedServer.objects.create(
+            server_name="another.test.server",
+            status="blocked",
+        )
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.peers(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(data[0], "test.server")
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 1dbd67a76..7d9ab3125 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -7,8 +7,8 @@ from django.views.generic.base import TemplateView
 from bookwyrm import settings, views
 from bookwyrm.utils import regex
 
-USER_PATH = r"^user/(?P<username>%s)" % regex.USERNAME
-LOCAL_USER_PATH = r"^user/(?P<username>%s)" % regex.LOCALNAME
+USER_PATH = rf"^user/(?P<username>{regex.USERNAME})"
+LOCAL_USER_PATH = rf"^user/(?P<username>{regex.LOCALNAME})"
 
 status_types = [
     "status",
@@ -19,7 +19,9 @@ status_types = [
     "boost",
     "generatednote",
 ]
-STATUS_PATH = r"%s/(%s)/(?P<status_id>\d+)" % (USER_PATH, "|".join(status_types))
+
+STATUS_TYPES_STRING = "|".join(status_types)
+STATUS_PATH = rf"{USER_PATH}/({STATUS_TYPES_STRING})/(?P<status_id>\d+)"
 
 BOOK_PATH = r"^book/(?P<book_id>\d+)"
 
@@ -33,14 +35,15 @@ urlpatterns = [
     ),
     # federation endpoints
     re_path(r"^inbox/?$", views.Inbox.as_view()),
-    re_path(r"%s/inbox/?$" % LOCAL_USER_PATH, views.Inbox.as_view()),
-    re_path(r"%s/outbox/?$" % LOCAL_USER_PATH, views.Outbox.as_view()),
+    re_path(rf"{LOCAL_USER_PATH}/inbox/?$", views.Inbox.as_view()),
+    re_path(rf"{LOCAL_USER_PATH}/outbox/?$", views.Outbox.as_view()),
     re_path(r"^\.well-known/webfinger/?$", views.webfinger),
     re_path(r"^\.well-known/nodeinfo/?$", views.nodeinfo_pointer),
     re_path(r"^\.well-known/host-meta/?$", views.host_meta),
     re_path(r"^nodeinfo/2\.0/?$", views.nodeinfo),
     re_path(r"^api/v1/instance/?$", views.instance_info),
     re_path(r"^api/v1/instance/peers/?$", views.peers),
+    re_path(r"^opensearch.xml$", views.opensearch, name="opensearch"),
     # polling updates
     re_path("^api/updates/notifications/?$", views.get_notification_count),
     re_path("^api/updates/stream/(?P<stream>[a-z]+)/?$", views.get_unread_status_count),
@@ -54,7 +57,7 @@ urlpatterns = [
         views.ConfirmEmailCode.as_view(),
         name="confirm-email-code",
     ),
-    re_path(r"resend-link", views.resend_link, name="resend-link"),
+    re_path(r"^resend-link/?$", views.resend_link, name="resend-link"),
     re_path(r"^logout/?$", views.Logout.as_view(), name="logout"),
     re_path(
         r"^password-reset/?$",
@@ -65,6 +68,9 @@ urlpatterns = [
         r"^password-reset/(?P<code>[A-Za-z0-9]+)/?$", views.PasswordReset.as_view()
     ),
     # admin
+    re_path(
+        r"^settings/dashboard/?$", views.Dashboard.as_view(), name="settings-dashboard"
+    ),
     re_path(r"^settings/site-settings/?$", views.Site.as_view(), name="settings-site"),
     re_path(
         r"^settings/announcements/?$",
@@ -83,7 +89,7 @@ urlpatterns = [
     ),
     re_path(
         r"^settings/email-preview/?$",
-        views.site.email_preview,
+        views.admin.site.email_preview,
         name="settings-email-preview",
     ),
     re_path(
@@ -95,7 +101,7 @@ urlpatterns = [
         name="settings-user",
     ),
     re_path(
-        r"^settings/federation/?$",
+        r"^settings/federation/(?P<status>(federated|blocked))?/?$",
         views.Federation.as_view(),
         name="settings-federation",
     ),
@@ -106,12 +112,12 @@ urlpatterns = [
     ),
     re_path(
         r"^settings/federation/(?P<server>\d+)/block?$",
-        views.federation.block_server,
+        views.block_server,
         name="settings-federated-server-block",
     ),
     re_path(
         r"^settings/federation/(?P<server>\d+)/unblock?$",
-        views.federation.unblock_server,
+        views.unblock_server,
         name="settings-federated-server-unblock",
     ),
     re_path(
@@ -141,6 +147,26 @@ urlpatterns = [
         r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request"
     ),
     re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
+    re_path(
+        r"^settings/email-blocklist/?$",
+        views.EmailBlocklist.as_view(),
+        name="settings-email-blocks",
+    ),
+    re_path(
+        r"^settings/email-blocks/(?P<domain_id>\d+)/delete/?$",
+        views.EmailBlocklist.as_view(),
+        name="settings-email-blocks-delete",
+    ),
+    re_path(
+        r"^settings/ip-blocklist/?$",
+        views.IPBlocklist.as_view(),
+        name="settings-ip-blocks",
+    ),
+    re_path(
+        r"^settings/ip-blocks/(?P<block_id>\d+)/delete/?$",
+        views.IPBlocklist.as_view(),
+        name="settings-ip-blocks-delete",
+    ),
     # moderation
     re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
     re_path(
@@ -153,6 +179,16 @@ urlpatterns = [
         views.suspend_user,
         name="settings-report-suspend",
     ),
+    re_path(
+        r"^settings/reports/(?P<user_id>\d+)/unsuspend/?$",
+        views.unsuspend_user,
+        name="settings-report-unsuspend",
+    ),
+    re_path(
+        r"^settings/reports/(?P<user_id>\d+)/delete/?$",
+        views.moderator_delete_user,
+        name="settings-delete-user",
+    ),
     re_path(
         r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
         views.resolve_report,
@@ -187,12 +223,12 @@ urlpatterns = [
         name="get-started-users",
     ),
     # feeds
-    re_path(r"^(?P<tab>{:s})/?$".format(STREAMS), views.Feed.as_view()),
+    re_path(rf"^(?P<tab>{STREAMS})/?$", views.Feed.as_view()),
     re_path(
         r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages"
     ),
     re_path(
-        r"^direct-messages/(?P<username>%s)?$" % regex.USERNAME,
+        rf"^direct-messages/(?P<username>{regex.USERNAME})?$",
         views.DirectMessage.as_view(),
         name="direct-messages-user",
     ),
@@ -202,24 +238,26 @@ urlpatterns = [
     re_path(r"^import/?$", views.Import.as_view(), name="import"),
     re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view(), name="import-status"),
     # users
-    re_path(r"%s\.json$" % USER_PATH, views.User.as_view()),
-    re_path(r"%s/?$" % USER_PATH, views.User.as_view(), name="user-feed"),
-    re_path(r"%s/rss" % USER_PATH, views.rss_feed.RssFeed(), name="user-rss"),
+    re_path(rf"{USER_PATH}\.json$", views.User.as_view()),
+    re_path(rf"{USER_PATH}/?$", views.User.as_view(), name="user-feed"),
+    re_path(rf"{USER_PATH}/rss/?$", views.rss_feed.RssFeed(), name="user-rss"),
     re_path(
-        r"%s/followers(.json)?/?$" % USER_PATH,
+        rf"{USER_PATH}/followers(.json)?/?$",
         views.Followers.as_view(),
         name="user-followers",
     ),
     re_path(
-        r"%s/following(.json)?/?$" % USER_PATH,
+        rf"{USER_PATH}/following(.json)?/?$",
         views.Following.as_view(),
         name="user-following",
     ),
+    re_path(r"^hide-suggestions/?$", views.hide_suggestions, name="hide-suggestions"),
     # lists
-    re_path(r"%s/lists/?$" % USER_PATH, views.UserLists.as_view(), name="user-lists"),
+    re_path(rf"{USER_PATH}/lists/?$", views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/saved/?$", views.SavedLists.as_view(), name="saved-lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
+    re_path(r"^list/delete/(?P<list_id>\d+)/?$", views.delete_list, name="delete-list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
     re_path(
         r"^list/(?P<list_id>\d+)/remove/?$",
@@ -237,14 +275,14 @@ urlpatterns = [
     re_path(r"^save-list/(?P<list_id>\d+)/?$", views.save_list, name="list-save"),
     re_path(r"^unsave-list/(?P<list_id>\d+)/?$", views.unsave_list, name="list-unsave"),
     # User books
-    re_path(r"%s/books/?$" % USER_PATH, views.Shelf.as_view(), name="user-shelves"),
+    re_path(rf"{USER_PATH}/books/?$", views.Shelf.as_view(), name="user-shelves"),
     re_path(
-        r"^%s/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % USER_PATH,
+        rf"^{USER_PATH}/(shelf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$",
         views.Shelf.as_view(),
         name="shelf",
     ),
     re_path(
-        r"^%s/(books|shelf)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % LOCAL_USER_PATH,
+        rf"^{LOCAL_USER_PATH}/(books|shelf)/(?P<shelf_identifier>[\w-]+)(.json)?/?$",
         views.Shelf.as_view(),
         name="shelf",
     ),
@@ -254,7 +292,7 @@ urlpatterns = [
     re_path(r"^unshelve/?$", views.unshelve),
     # goals
     re_path(
-        r"%s/goal/(?P<year>\d{4})/?$" % USER_PATH,
+        rf"{LOCAL_USER_PATH}/goal/(?P<year>\d+)/?$",
         views.Goal.as_view(),
         name="user-goal",
     ),
@@ -271,10 +309,10 @@ urlpatterns = [
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
     # statuses
-    re_path(r"%s(.json)?/?$" % STATUS_PATH, views.Status.as_view(), name="status"),
-    re_path(r"%s/activity/?$" % STATUS_PATH, views.Status.as_view(), name="status"),
+    re_path(rf"{STATUS_PATH}(.json)?/?$", views.Status.as_view(), name="status"),
+    re_path(rf"{STATUS_PATH}/activity/?$", views.Status.as_view(), name="status"),
     re_path(
-        r"%s/replies(.json)?/?$" % STATUS_PATH, views.Replies.as_view(), name="replies"
+        rf"{STATUS_PATH}/replies(.json)?/?$", views.Replies.as_view(), name="replies"
     ),
     re_path(
         r"^post/?$",
@@ -304,17 +342,17 @@ urlpatterns = [
     re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
-    re_path(r"%s(.json)?/?$" % BOOK_PATH, views.Book.as_view(), name="book"),
+    re_path(rf"{BOOK_PATH}(.json)?/?$", views.Book.as_view(), name="book"),
     re_path(
-        r"%s/(?P<user_statuses>review|comment|quote)/?$" % BOOK_PATH,
+        rf"{BOOK_PATH}/(?P<user_statuses>review|comment|quote)/?$",
         views.Book.as_view(),
         name="book-user-statuses",
     ),
-    re_path(r"%s/edit/?$" % BOOK_PATH, views.EditBook.as_view(), name="edit-book"),
-    re_path(r"%s/confirm/?$" % BOOK_PATH, views.ConfirmEditBook.as_view()),
+    re_path(rf"{BOOK_PATH}/edit/?$", views.EditBook.as_view(), name="edit-book"),
+    re_path(rf"{BOOK_PATH}/confirm/?$", views.ConfirmEditBook.as_view()),
     re_path(r"^create-book/?$", views.EditBook.as_view(), name="create-book"),
     re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
-    re_path(r"%s/editions(.json)?/?$" % BOOK_PATH, views.Editions.as_view()),
+    re_path(rf"{BOOK_PATH}/editions(.json)?/?$", views.Editions.as_view()),
     re_path(
         r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover, name="upload-cover"
     ),
diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py
index 3ac5a0ffd..f0c442459 100644
--- a/bookwyrm/utils/regex.py
+++ b/bookwyrm/utils/regex.py
@@ -3,8 +3,8 @@
 DOMAIN = r"[\w_\-\.]+\.[a-z]{2,}"
 LOCALNAME = r"@?[a-zA-Z_\-\.0-9]+"
 STRICT_LOCALNAME = r"@[a-zA-Z_\-\.0-9]+"
-USERNAME = r"%s(@%s)?" % (LOCALNAME, DOMAIN)
-STRICT_USERNAME = r"\B%s(@%s)?\b" % (STRICT_LOCALNAME, DOMAIN)
-FULL_USERNAME = r"%s@%s\b" % (LOCALNAME, DOMAIN)
+USERNAME = rf"{LOCALNAME}(@{DOMAIN})?"
+STRICT_USERNAME = rf"\B{STRICT_LOCALNAME}(@{DOMAIN})?\b"
+FULL_USERNAME = rf"{LOCALNAME}@{DOMAIN}\b"
 # should match (BookWyrm/1.0.0; or (BookWyrm/99.1.2;
 BOOKWYRM_USER_AGENT = r"\(BookWyrm/[0-9]+\.[0-9]+\.[0-9]+;"
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index f42049254..16ebb2bad 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,7 +1,24 @@
 """ make sure all our nice views are available """
-from .announcements import Announcements, Announcement, delete_announcement
-from .authentication import Login, Register, Logout
-from .authentication import ConfirmEmail, ConfirmEmailCode, resend_link
+from .admin.announcements import Announcements, Announcement, delete_announcement
+from .admin.dashboard import Dashboard
+from .admin.federation import Federation, FederatedServer
+from .admin.federation import AddFederatedServer, ImportServerBlocklist
+from .admin.federation import block_server, unblock_server
+from .admin.email_blocklist import EmailBlocklist
+from .admin.ip_blocklist import IPBlocklist
+from .admin.invite import ManageInvites, Invite, InviteRequest
+from .admin.invite import ManageInviteRequests, ignore_invite_request
+from .admin.reports import (
+    Report,
+    Reports,
+    make_report,
+    resolve_report,
+    suspend_user,
+    unsuspend_user,
+    moderator_delete_user,
+)
+from .admin.site import Site
+from .admin.user_admin import UserAdmin, UserAdminList
 from .author import Author, EditAuthor
 from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook
@@ -10,9 +27,6 @@ from .directory import Directory
 from .discover import Discover
 from .edit_user import EditUser, DeleteUser
 from .editions import Editions, switch_edition
-from .federation import Federation, FederatedServer
-from .federation import AddFederatedServer, ImportServerBlocklist
-from .federation import block_server, unblock_server
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
@@ -21,27 +35,24 @@ from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
-from .invite import ManageInvites, Invite, InviteRequest
-from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Landing
 from .list import Lists, SavedLists, List, Curate, UserLists
-from .list import save_list, unsave_list
+from .list import save_list, unsave_list, delete_list
+from .login import Login, Logout
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough
 from .reading import delete_readthrough, delete_progressupdate
 from .reading import ReadingStatus
-from .reports import Report, Reports, make_report, resolve_report, suspend_user
+from .register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
 from .shelf import Shelf
 from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
-from .site import Site
 from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .updates import get_notification_count, get_unread_status_count
-from .user import User, Followers, Following
-from .user_admin import UserAdmin, UserAdminList
+from .user import User, Followers, Following, hide_suggestions
 from .wellknown import *
diff --git a/bookwyrm/views/admin/__init__.py b/bookwyrm/views/admin/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/admin/announcements.py
similarity index 98%
rename from bookwyrm/views/announcements.py
rename to bookwyrm/views/admin/announcements.py
index 05386b7b1..e778b709a 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/admin/announcements.py
@@ -31,6 +31,7 @@ class Announcements(View):
             "end_date",
             "active",
         ]
+        # pylint: disable=consider-using-f-string
         if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             announcements = announcements.order_by(sort)
         data = {
diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py
new file mode 100644
index 000000000..161dc6da1
--- /dev/null
+++ b/bookwyrm/views/admin/dashboard.py
@@ -0,0 +1,88 @@
+""" instance overview """
+from datetime import timedelta
+from dateutil.parser import parse
+
+from django.contrib.auth.decorators import login_required, permission_required
+from django.db.models import Q
+from django.template.response import TemplateResponse
+from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+class Dashboard(View):
+    """admin overview"""
+
+    def get(self, request):
+        """list of users"""
+        interval = int(request.GET.get("days", 1))
+        now = timezone.now()
+
+        user_queryset = models.User.objects.filter(local=True)
+        user_stats = {"labels": [], "total": [], "active": []}
+
+        status_queryset = models.Status.objects.filter(user__local=True, deleted=False)
+        status_stats = {"labels": [], "total": []}
+
+        start = request.GET.get("start")
+        if start:
+            start = timezone.make_aware(parse(start))
+        else:
+            start = now - timedelta(days=6 * interval)
+
+        end = request.GET.get("end")
+        end = timezone.make_aware(parse(end)) if end else now
+        start = start.replace(hour=0, minute=0, second=0)
+
+        interval_start = start
+        interval_end = interval_start + timedelta(days=interval)
+        while interval_start <= end:
+            print(interval_start, interval_end)
+            interval_queryset = user_queryset.filter(
+                Q(is_active=True) | Q(deactivation_date__gt=interval_end),
+                created_date__lte=interval_end,
+            )
+            user_stats["total"].append(interval_queryset.filter().count())
+            user_stats["active"].append(
+                interval_queryset.filter(
+                    last_active_date__gt=interval_end - timedelta(days=31),
+                ).count()
+            )
+            user_stats["labels"].append(interval_start.strftime("%b %d"))
+
+            status_stats["total"].append(
+                status_queryset.filter(
+                    created_date__gt=interval_start,
+                    created_date__lte=interval_end,
+                ).count()
+            )
+            status_stats["labels"].append(interval_start.strftime("%b %d"))
+            interval_start = interval_end
+            interval_end += timedelta(days=interval)
+
+        data = {
+            "start": start.strftime("%Y-%m-%d"),
+            "end": end.strftime("%Y-%m-%d"),
+            "interval": interval,
+            "users": user_queryset.filter(is_active=True).count(),
+            "active_users": user_queryset.filter(
+                is_active=True, last_active_date__gte=now - timedelta(days=31)
+            ).count(),
+            "statuses": status_queryset.count(),
+            "works": models.Work.objects.count(),
+            "reports": models.Report.objects.filter(resolved=False).count(),
+            "invite_requests": models.InviteRequest.objects.filter(
+                ignored=False, invite_sent=False
+            ).count(),
+            "user_stats": user_stats,
+            "status_stats": status_stats,
+        }
+        return TemplateResponse(request, "settings/dashboard.html", data)
diff --git a/bookwyrm/views/admin/email_blocklist.py b/bookwyrm/views/admin/email_blocklist.py
new file mode 100644
index 000000000..cd3d83fdb
--- /dev/null
+++ b/bookwyrm/views/admin/email_blocklist.py
@@ -0,0 +1,49 @@
+""" Manage email blocklist"""
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms, models
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+class EmailBlocklist(View):
+    """Block registration by email address"""
+
+    def get(self, request):
+        """view and compose blocks"""
+        data = {
+            "domains": models.EmailBlocklist.objects.order_by("-created_date").all(),
+            "form": forms.EmailBlocklistForm(),
+        }
+        return TemplateResponse(request, "settings/email_blocklist.html", data)
+
+    def post(self, request, domain_id=None):
+        """create a new domain block"""
+        if domain_id:
+            return self.delete(request, domain_id)
+
+        form = forms.EmailBlocklistForm(request.POST)
+        data = {
+            "domains": models.EmailBlocklist.objects.order_by("-created_date").all(),
+            "form": form,
+        }
+        if not form.is_valid():
+            return TemplateResponse(request, "settings/email_blocklist.html", data)
+        form.save()
+
+        data["form"] = forms.EmailBlocklistForm()
+        return TemplateResponse(request, "settings/email_blocklist.html", data)
+
+    # pylint: disable=unused-argument
+    def delete(self, request, domain_id):
+        """remove a domain block"""
+        domain = get_object_or_404(models.EmailBlocklist, id=domain_id)
+        domain.delete()
+        return redirect("settings-email-blocks")
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/admin/federation.py
similarity index 92%
rename from bookwyrm/views/federation.py
rename to bookwyrm/views/admin/federation.py
index d4a1af127..97dfd6ff0 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/admin/federation.py
@@ -22,20 +22,25 @@ from bookwyrm.settings import PAGE_LENGTH
 class Federation(View):
     """what servers do we federate with"""
 
-    def get(self, request):
+    def get(self, request, status="federated"):
         """list of servers"""
-        servers = models.FederatedServer.objects
+        servers = models.FederatedServer.objects.filter(status=status)
 
         sort = request.GET.get("sort")
         sort_fields = ["created_date", "application_type", "server_name"]
+        # pylint: disable=consider-using-f-string
         if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
-            sort = "created_date"
+            sort = "-created_date"
         servers = servers.order_by(sort)
 
         paginated = Paginator(servers, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
 
         data = {
-            "servers": paginated.get_page(request.GET.get("page")),
+            "servers": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "sort": sort,
             "form": forms.ServerForm(),
         }
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/admin/invite.py
similarity index 95%
rename from bookwyrm/views/invite.py
rename to bookwyrm/views/admin/invite.py
index 005d57cf8..f4c82e485 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/admin/invite.py
@@ -16,7 +16,7 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import emailing, forms, models
 from bookwyrm.settings import PAGE_LENGTH
-from . import helpers
+from bookwyrm.views import helpers
 
 
 # pylint: disable= no-self-use
@@ -51,7 +51,7 @@ class ManageInvites(View):
         """creates an invite database entry"""
         form = forms.CreateInviteForm(request.POST)
         if not form.is_valid():
-            return HttpResponseBadRequest("ERRORS : %s" % (form.errors,))
+            return HttpResponseBadRequest(f"ERRORS: {form.errors}")
 
         invite = form.save(commit=False)
         invite.user = request.user
@@ -83,7 +83,7 @@ class Invite(View):
         }
         return TemplateResponse(request, "invite.html", data)
 
-    # post handling is in views.authentication.Register
+    # post handling is in views.register.Register
 
 
 class ManageInviteRequests(View):
@@ -98,6 +98,7 @@ class ManageInviteRequests(View):
             "invite__times_used",
             "invite__invitees__created_date",
         ]
+        # pylint: disable=consider-using-f-string
         if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             sort = "-created_date"
 
@@ -149,6 +150,7 @@ class ManageInviteRequests(View):
             )
             invite_request.save()
         emailing.invite_email(invite_request)
+        # pylint: disable=consider-using-f-string
         return redirect(
             "{:s}?{:s}".format(
                 reverse("settings-invite-requests"), urlencode(request.GET.dict())
diff --git a/bookwyrm/views/admin/ip_blocklist.py b/bookwyrm/views/admin/ip_blocklist.py
new file mode 100644
index 000000000..643dae22c
--- /dev/null
+++ b/bookwyrm/views/admin/ip_blocklist.py
@@ -0,0 +1,49 @@
+""" Manage IP blocklist """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms, models
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+class IPBlocklist(View):
+    """Block registration by ip address"""
+
+    def get(self, request):
+        """view and compose blocks"""
+        data = {
+            "addresses": models.IPBlocklist.objects.all(),
+            "form": forms.IPBlocklistForm(),
+        }
+        return TemplateResponse(request, "settings/ip_blocklist.html", data)
+
+    def post(self, request, block_id=None):
+        """create a new ip address block"""
+        if block_id:
+            return self.delete(request, block_id)
+
+        form = forms.IPBlocklistForm(request.POST)
+        data = {
+            "addresses": models.IPBlocklist.objects.all(),
+            "form": form,
+        }
+        if not form.is_valid():
+            return TemplateResponse(request, "settings/ip_blocklist.html", data)
+        form.save()
+
+        data["form"] = forms.IPBlocklistForm()
+        return TemplateResponse(request, "settings/ip_blocklist.html", data)
+
+    # pylint: disable=unused-argument
+    def delete(self, request, domain_id):
+        """remove a domain block"""
+        domain = get_object_or_404(models.IPBlocklist, id=domain_id)
+        domain.delete()
+        return redirect("settings-ip-blocks")
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/admin/reports.py
similarity index 70%
rename from bookwyrm/views/reports.py
rename to bookwyrm/views/admin/reports.py
index 46c238844..23bb6fa3d 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/admin/reports.py
@@ -1,5 +1,6 @@
 """ moderation via flagged posts and users """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -77,12 +78,50 @@ class Report(View):
 def suspend_user(_, user_id):
     """mark an account as inactive"""
     user = get_object_or_404(models.User, id=user_id)
-    user.is_active = not user.is_active
+    user.is_active = False
+    user.deactivation_reason = "moderator_suspension"
     # this isn't a full deletion, so we don't want to tell the world
     user.save(broadcast=False)
     return redirect("settings-user", user.id)
 
 
+@login_required
+@permission_required("bookwyrm_moderate_user")
+def unsuspend_user(_, user_id):
+    """mark an account as inactive"""
+    user = get_object_or_404(models.User, id=user_id)
+    user.is_active = True
+    user.deactivation_reason = None
+    # this isn't a full deletion, so we don't want to tell the world
+    user.save(broadcast=False)
+    return redirect("settings-user", user.id)
+
+
+@login_required
+@permission_required("bookwyrm_moderate_user")
+def moderator_delete_user(request, user_id):
+    """permanently delete a user"""
+    user = get_object_or_404(models.User, id=user_id)
+
+    # we can't delete users on other instances
+    if not user.local:
+        raise PermissionDenied()
+
+    form = forms.DeleteUserForm(request.POST, instance=user)
+
+    moderator = models.User.objects.get(id=request.user.id)
+    # check the moderator's password
+    if form.is_valid() and moderator.check_password(form.cleaned_data["password"]):
+        user.deactivation_reason = "moderator_deletion"
+        user.delete()
+        return redirect("settings-user", user.id)
+
+    form.errors["password"] = ["Invalid password"]
+
+    data = {"user": user, "group_form": forms.UserGroupForm(), "form": form}
+    return TemplateResponse(request, "user_admin/user.html", data)
+
+
 @login_required
 @permission_required("bookwyrm_moderate_post")
 def resolve_report(_, report_id):
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/admin/site.py
similarity index 88%
rename from bookwyrm/views/site.py
rename to bookwyrm/views/admin/site.py
index 42e8a6dd5..b66fdb9f4 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/admin/site.py
@@ -41,9 +41,9 @@ def email_preview(request):
     """for development, renders and example email template"""
     template = request.GET.get("email")
     data = emailing.email_data()
-    data["subject_path"] = "email/{}/subject.html".format(template)
-    data["html_content_path"] = "email/{}/html_content.html".format(template)
-    data["text_content_path"] = "email/{}/text_content.html".format(template)
+    data["subject_path"] = f"email/{template}/subject.html"
+    data["html_content_path"] = f"email/{template}/html_content.html"
+    data["text_content_path"] = f"email/{template}/text_content.html"
     data["reset_link"] = "https://example.com/link"
     data["invite_link"] = "https://example.com/link"
     data["confirmation_link"] = "https://example.com/link"
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/admin/user_admin.py
similarity index 89%
rename from bookwyrm/views/user_admin.py
rename to bookwyrm/views/admin/user_admin.py
index 7cfefb0f4..b29214e73 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/admin/user_admin.py
@@ -13,7 +13,7 @@ from bookwyrm.settings import PAGE_LENGTH
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required("bookwyrm.moderate_users", raise_exception=True),
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
     name="dispatch",
 )
 class UserAdminList(View):
@@ -31,8 +31,11 @@ class UserAdminList(View):
         if username:
             filters["username__icontains"] = username
         scope = request.GET.get("scope")
-        if scope:
-            filters["local"] = scope == "local"
+        if scope and scope == "local":
+            filters["local"] = True
+        email = request.GET.get("email")
+        if email:
+            filters["email__endswith"] = email
 
         users = models.User.objects.filter(**filters)
 
@@ -44,6 +47,7 @@ class UserAdminList(View):
             "federated_server__server_name",
             "is_active",
         ]
+        # pylint: disable=consider-using-f-string
         if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             users = users.order_by(sort)
 
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index e51dc7d83..e1e9247de 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -55,4 +55,4 @@ class EditAuthor(View):
             return TemplateResponse(request, "author/edit_author.html", data)
         author = form.save()
 
-        return redirect("/author/%s" % author.id)
+        return redirect(f"/author/{author.id}")
diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py
index 99014a937..90b3be90c 100644
--- a/bookwyrm/views/block.py
+++ b/bookwyrm/views/block.py
@@ -1,6 +1,5 @@
 """ views for actions you can take in the application """
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -24,7 +23,7 @@ class Block(View):
         models.UserBlocks.objects.create(
             user_subject=request.user, user_object=to_block
         )
-        return redirect("/preferences/block")
+        return redirect("prefs-block")
 
 
 @require_POST
@@ -32,12 +31,10 @@ class Block(View):
 def unblock(request, user_id):
     """undo a block"""
     to_unblock = get_object_or_404(models.User, id=user_id)
-    try:
-        block = models.UserBlocks.objects.get(
-            user_subject=request.user,
-            user_object=to_unblock,
-        )
-    except models.UserBlocks.DoesNotExist:
-        return HttpResponseNotFound()
+    block = get_object_or_404(
+        models.UserBlocks,
+        user_subject=request.user,
+        user_object=to_unblock,
+    )
     block.delete()
-    return redirect("/preferences/block")
+    return redirect("prefs-block")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index c25252959..e2878aca7 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -8,7 +8,7 @@ from django.core.files.base import ContentFile
 from django.core.paginator import Paginator
 from django.db import transaction
 from django.db.models import Avg, Q
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponseBadRequest, Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.datastructures import MultiValueDictKeyError
@@ -30,25 +30,31 @@ class Book(View):
 
     def get(self, request, book_id, user_statuses=False):
         """info about a book"""
-        user_statuses = user_statuses if request.user.is_authenticated else False
-        try:
-            book = models.Book.objects.select_subclasses().get(id=book_id)
-        except models.Book.DoesNotExist:
-            return HttpResponseNotFound()
-
         if is_api_request(request):
+            book = get_object_or_404(
+                models.Book.objects.select_subclasses(), id=book_id
+            )
             return ActivitypubResponse(book.to_activity())
 
-        if isinstance(book, models.Work):
-            book = book.default_edition
+        user_statuses = user_statuses if request.user.is_authenticated else False
+
+        # it's safe to use this OR because edition and work and subclasses of the same
+        # table, so they never have clashing IDs
+        book = (
+            models.Edition.viewer_aware_objects(request.user)
+            .filter(Q(id=book_id) | Q(parent_work__id=book_id))
+            .order_by("-edition_rank")
+            .select_related("parent_work")
+            .prefetch_related("authors")
+            .first()
+        )
+
         if not book or not book.parent_work:
-            return HttpResponseNotFound()
+            raise Http404()
 
-        work = book.parent_work
-
-        # all reviews for the book
+        # all reviews for all editions of the book
         reviews = privacy_filter(
-            request.user, models.Review.objects.filter(book__in=work.editions.all())
+            request.user, models.Review.objects.filter(book__parent_work__editions=book)
         )
 
         # the reviews to show
@@ -174,7 +180,7 @@ class EditBook(View):
             # check if this is an edition of an existing work
             author_text = book.author_text if book else add_author
             data["book_matches"] = connector_manager.local_search(
-                "%s %s" % (form.cleaned_data.get("title"), author_text),
+                f'{form.cleaned_data.get("title")} {author_text}',
                 min_confidence=0.5,
                 raw=True,
             )[:5]
@@ -212,7 +218,7 @@ class EditBook(View):
             if image:
                 book.cover.save(*image, save=False)
         book.save()
-        return redirect("/book/%s" % book.id)
+        return redirect(f"/book/{book.id}")
 
 
 @method_decorator(login_required, name="dispatch")
@@ -238,14 +244,14 @@ class ConfirmEditBook(View):
 
             # get or create author as needed
             for i in range(int(request.POST.get("author-match-count", 0))):
-                match = request.POST.get("author_match-%d" % i)
+                match = request.POST.get(f"author_match-{i}")
                 if not match:
                     return HttpResponseBadRequest()
                 try:
                     # if it's an int, it's an ID
                     match = int(match)
                     author = get_object_or_404(
-                        models.Author, id=request.POST["author_match-%d" % i]
+                        models.Author, id=request.POST[f"author_match-{i}"]
                     )
                 except ValueError:
                     # otherwise it's a name
@@ -267,7 +273,7 @@ class ConfirmEditBook(View):
             for author_id in request.POST.getlist("remove_authors"):
                 book.authors.remove(author_id)
 
-        return redirect("/book/%s" % book.id)
+        return redirect(f"/book/{book.id}")
 
 
 @login_required
@@ -283,7 +289,7 @@ def upload_cover(request, book_id):
         if image:
             book.cover.save(*image)
 
-        return redirect("{:s}?cover_error=True".format(book.local_path))
+        return redirect(f"{book.local_path}?cover_error=True")
 
     form = forms.CoverForm(request.POST, request.FILES, instance=book)
     if not form.is_valid() or not form.files.get("cover"):
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
index 059365f97..2ae4a9303 100644
--- a/bookwyrm/views/discover.py
+++ b/bookwyrm/views/discover.py
@@ -16,6 +16,7 @@ class Discover(View):
 
     def get(self, request):
         """tiled book activity page"""
+        # all activities in the "federated" feed associated with a book
         activities = (
             activitystreams.streams["local"]
             .get_activity_stream(request.user)
@@ -29,13 +30,19 @@ class Discover(View):
 
         large_activities = Paginator(
             activities.filter(mention_books__isnull=True)
-            .exclude(content=None, quotation__quote=None)
-            .exclude(content=""),
+            # exclude statuses with no user-provided content for large panels
+            .exclude(
+                Q(Q(content="") | Q(content__isnull=True)) & Q(quotation__isnull=True),
+            ),
             6,
         )
         small_activities = Paginator(
             activities.filter(
-                Q(mention_books__isnull=False) | Q(content=None) | Q(content="")
+                Q(mention_books__isnull=False)
+                | Q(
+                    Q(Q(content="") | Q(content__isnull=True))
+                    & Q(quotation__isnull=True),
+                )
             ),
             4,
         )
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
index c74b00c9d..0a2d93275 100644
--- a/bookwyrm/views/edit_user.py
+++ b/bookwyrm/views/edit_user.py
@@ -34,9 +34,9 @@ class EditUser(View):
             data = {"form": form, "user": request.user}
             return TemplateResponse(request, "preferences/edit_user.html", data)
 
-        user = save_user_form(form)
+        save_user_form(form)
 
-        return redirect(user.local_path)
+        return redirect("user-feed", request.user.localname)
 
 
 # pylint: disable=no-self-use
@@ -55,7 +55,6 @@ class DeleteUser(View):
     def post(self, request):
         """les get fancy with images"""
         form = forms.DeleteUserForm(request.POST, instance=request.user)
-        form.is_valid()
         # idk why but I couldn't get check_password to work on request.user
         user = models.User.objects.get(id=request.user.id)
         if form.is_valid() and user.check_password(form.cleaned_data["password"]):
@@ -80,7 +79,7 @@ def save_user_form(form):
 
         # set the name to a hash
         extension = form.files["avatar"].name.split(".")[-1]
-        filename = "%s.%s" % (uuid4(), extension)
+        filename = f"{uuid4()}.{extension}"
         user.avatar.save(filename, image, save=False)
     user.save()
     return user
diff --git a/bookwyrm/views/editions.py b/bookwyrm/views/editions.py
index 7615c497c..d044f17cd 100644
--- a/bookwyrm/views/editions.py
+++ b/bookwyrm/views/editions.py
@@ -96,4 +96,4 @@ def switch_edition(request):
         readthrough.book = new_edition
         readthrough.save()
 
-    return redirect("/book/%d" % new_edition.id)
+    return redirect(f"/book/{new_edition.id}")
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 7a46ca57d..0c2647aea 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -3,6 +3,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db.models import Q
 from django.http import HttpResponseNotFound, Http404
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -42,7 +43,7 @@ class Feed(View):
                 "tab": tab,
                 "streams": STREAMS,
                 "goal_form": forms.GoalForm(),
-                "path": "/%s" % tab["key"],
+                "path": f"/{tab['key']}",
             },
         }
         return TemplateResponse(request, "feed/feed.html", data)
@@ -93,21 +94,15 @@ class Status(View):
 
     def get(self, request, username, status_id):
         """display a particular status (and replies, etc)"""
-        try:
-            user = get_user_from_username(request.user, username)
-            status = models.Status.objects.select_subclasses().get(
-                id=status_id, deleted=False
-            )
-        except (ValueError, models.Status.DoesNotExist):
-            return HttpResponseNotFound()
-
-        # the url should have the poster's username in it
-        if user != status.user:
-            return HttpResponseNotFound()
-
+        user = get_user_from_username(request.user, username)
+        status = get_object_or_404(
+            models.Status.objects.select_subclasses(),
+            user=user,
+            id=status_id,
+            deleted=False,
+        )
         # make sure the user is authorized to see the status
-        if not status.visible_to_user(request.user):
-            return HttpResponseNotFound()
+        status.raise_visible_to_user(request.user)
 
         if is_api_request(request):
             return ActivitypubResponse(
@@ -137,6 +132,7 @@ class Replies(View):
         status = models.Status.objects.get(id=status_id)
         if status.user.localname != username:
             return HttpResponseNotFound()
+        status.raise_visible_to_user(request.user)
 
         return ActivitypubResponse(status.to_replies(**request.GET))
 
@@ -172,9 +168,11 @@ def get_suggested_books(user, max_books=5):
         shelf_preview = {
             "name": shelf.name,
             "identifier": shelf.identifier,
-            "books": shelf.books.order_by("shelfbook").prefetch_related("authors")[
-                :limit
-            ],
+            "books": models.Edition.viewer_aware_objects(user)
+            .filter(
+                shelfbook__shelf=shelf,
+            )
+            .prefetch_related("authors")[:limit],
         }
         suggested_books.append(shelf_preview)
         book_count += len(shelf_preview["books"])
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index c3336a94a..7d91ce5b4 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -1,8 +1,7 @@
 """ views for actions you can take in the application """
 from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
-from django.http import HttpResponseBadRequest
-from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404, redirect
 from django.views.decorators.http import require_POST
 
 from bookwyrm import models
@@ -78,12 +77,10 @@ def delete_follow_request(request):
     username = request.POST["user"]
     requester = get_user_from_username(request.user, username)
 
-    try:
-        follow_request = models.UserFollowRequest.objects.get(
-            user_subject=requester, user_object=request.user
-        )
-    except models.UserFollowRequest.DoesNotExist:
-        return HttpResponseBadRequest()
+    follow_request = get_object_or_404(
+        models.UserFollowRequest, user_subject=requester, user_object=request.user
+    )
+    follow_request.raise_not_deletable(request.user)
 
     follow_request.delete()
-    return redirect("/user/%s" % request.user.localname)
+    return redirect(f"/user/{request.user.localname}")
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 3de88e104..4a6b55c58 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -5,7 +5,6 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.postgres.search import TrigramSimilarity
 from django.db.models.functions import Greatest
 from django.db.models import Count, Q
-from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -91,9 +90,8 @@ class GetStartedBooks(View):
         for (book_id, shelf_id) in shelve_actions:
             book = get_object_or_404(models.Edition, id=book_id)
             shelf = get_object_or_404(models.Shelf, id=shelf_id)
-            if shelf.user != request.user:
-                # hmmmmm
-                return HttpResponseNotFound()
+            shelf.raise_not_editable(request.user)
+
             models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
         return redirect(self.next_view)
 
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 122245179..105c8b90b 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -31,8 +31,8 @@ class Goal(View):
         if not goal and year != timezone.now().year:
             return redirect("user-goal", username, current_year)
 
-        if goal and not goal.visible_to_user(request.user):
-            return HttpResponseNotFound()
+        if goal:
+            goal.raise_visible_to_user(request.user)
 
         data = {
             "goal_form": forms.GoalForm(instance=goal),
@@ -45,12 +45,12 @@ class Goal(View):
 
     def post(self, request, username, year):
         """update or create an annual goal"""
-        user = get_user_from_username(request.user, username)
-        if user != request.user:
-            return HttpResponseNotFound()
-
         year = int(year)
-        goal = models.AnnualGoal.objects.filter(year=year, user=request.user).first()
+        user = get_user_from_username(request.user, username)
+        goal = models.AnnualGoal.objects.filter(year=year, user=user).first()
+        if goal:
+            goal.raise_not_editable(request.user)
+
         form = forms.GoalForm(request.POST, instance=goal)
         if not form.is_valid():
             data = {
@@ -62,11 +62,11 @@ class Goal(View):
         goal = form.save()
 
         if request.POST.get("post-status"):
-            # create status, if appropraite
+            # create status, if appropriate
             template = get_template("snippets/generated_status/goal.html")
             create_generated_note(
                 request.user,
-                template.render({"goal": goal, "user": request.user}).strip(),
+                template.render({"goal": goal, "user": user}).strip(),
                 privacy=goal.privacy,
             )
 
@@ -78,5 +78,5 @@ class Goal(View):
 def hide_goal(request):
     """don't keep bugging people to set a goal"""
     request.user.show_goal = False
-    request.user.save(broadcast=False)
+    request.user.save(broadcast=False, update_fields=["show_goal"])
     return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index b1e5f68c7..c1fe372cd 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -77,7 +77,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     elif "followers" in privacy_levels:
         queryset = queryset.exclude(
             ~Q(  # user isn't following and it isn't their own status
-                Q(user__in=viewer.following.all()) | Q(user=viewer)
+                Q(user__followers=viewer) | Q(user=viewer)
             ),
             privacy="followers",  # and the status is followers only
         )
@@ -113,7 +113,7 @@ def handle_remote_webfinger(query):
     try:
         user = models.User.objects.get(username__iexact=query)
     except models.User.DoesNotExist:
-        url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
+        url = f"https://{domain}/.well-known/webfinger?resource=acct:{query}"
         try:
             data = get_data(url)
         except (ConnectorException, HTTPError):
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 9e2e817dc..fe54c39a9 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -28,7 +28,7 @@ class Import(View):
         """load import page"""
         return TemplateResponse(
             request,
-            "import.html",
+            "import/import.html",
             {
                 "import_form": forms.ImportForm(),
                 "jobs": models.ImportJob.objects.filter(user=request.user).order_by(
@@ -68,7 +68,7 @@ class Import(View):
 
             importer.start_import(job)
 
-            return redirect("/import/%d" % job.id)
+            return redirect(f"/import/{job.id}")
         return HttpResponseBadRequest()
 
 
@@ -80,7 +80,7 @@ class ImportStatus(View):
         """status of an import job"""
         job = get_object_or_404(models.ImportJob, id=job_id)
         if job.user != request.user:
-            raise PermissionDenied
+            raise PermissionDenied()
 
         try:
             task = app.AsyncResult(job.task_id)
@@ -94,7 +94,7 @@ class ImportStatus(View):
         items = [i for i in items if not i.fail_reason]
         return TemplateResponse(
             request,
-            "import_status.html",
+            "import/import_status.html",
             {"job": job, "items": items, "failed_items": failed_items, "task": task},
         )
 
@@ -112,4 +112,4 @@ class ImportStatus(View):
             items,
         )
         importer.start_import(job)
-        return redirect("/import/%d" % job.id)
+        return redirect(f"/import/{job.id}")
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index ff5fa46da..239824958 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -3,8 +3,9 @@ import json
 import re
 from urllib.parse import urldefrag
 
-from django.http import HttpResponse, HttpResponseNotFound
-from django.http import HttpResponseBadRequest, HttpResponseForbidden
+from django.http import HttpResponse, Http404
+from django.core.exceptions import BadRequest, PermissionDenied
+from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.csrf import csrf_exempt
@@ -21,36 +22,30 @@ from bookwyrm.utils import regex
 class Inbox(View):
     """requests sent by outside servers"""
 
-    # pylint: disable=too-many-return-statements
     def post(self, request, username=None):
         """only works as POST request"""
         # first check if this server is on our shitlist
-        if is_blocked_user_agent(request):
-            return HttpResponseForbidden()
+        raise_is_blocked_user_agent(request)
 
         # make sure the user's inbox even exists
         if username:
-            try:
-                models.User.objects.get(localname=username)
-            except models.User.DoesNotExist:
-                return HttpResponseNotFound()
+            get_object_or_404(models.User, localname=username, is_active=True)
 
         # is it valid json? does it at least vaguely resemble an activity?
         try:
             activity_json = json.loads(request.body)
         except json.decoder.JSONDecodeError:
-            return HttpResponseBadRequest()
+            raise BadRequest()
 
         # let's be extra sure we didn't block this domain
-        if is_blocked_activity(activity_json):
-            return HttpResponseForbidden()
+        raise_is_blocked_activity(activity_json)
 
         if (
             not "object" in activity_json
             or not "type" in activity_json
             or not activity_json["type"] in activitypub.activity_objects
         ):
-            return HttpResponseNotFound()
+            raise Http404()
 
         # verify the signature
         if not has_valid_signature(request, activity_json):
@@ -65,35 +60,38 @@ class Inbox(View):
         return HttpResponse()
 
 
-def is_blocked_user_agent(request):
+def raise_is_blocked_user_agent(request):
     """check if a request is from a blocked server based on user agent"""
     # check user agent
     user_agent = request.headers.get("User-Agent")
     if not user_agent:
-        return False
-    url = re.search(r"https?://{:s}/?".format(regex.DOMAIN), user_agent)
+        return
+    url = re.search(rf"https?://{regex.DOMAIN}/?", user_agent)
     if not url:
-        return False
+        return
     url = url.group()
-    return models.FederatedServer.is_blocked(url)
+    if models.FederatedServer.is_blocked(url):
+        raise PermissionDenied()
 
 
-def is_blocked_activity(activity_json):
+def raise_is_blocked_activity(activity_json):
     """get the sender out of activity json and check if it's blocked"""
     actor = activity_json.get("actor")
 
     # check if the user is banned/deleted
     existing = models.User.find_existing_by_remote_id(actor)
     if existing and existing.deleted:
-        return True
+        raise PermissionDenied()
 
     if not actor:
         # well I guess it's not even a valid activity so who knows
-        return False
-    return models.FederatedServer.is_blocked(actor)
+        return
+
+    if models.FederatedServer.is_blocked(actor):
+        raise PermissionDenied()
 
 
-@app.task
+@app.task(queue="medium_priority")
 def activity_task(activity_json):
     """do something with this json we think is legit"""
     # lets see if the activitypub module can make sense of this json
diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py
index e138e41cf..910360d7a 100644
--- a/bookwyrm/views/interaction.py
+++ b/bookwyrm/views/interaction.py
@@ -1,12 +1,13 @@
 """ boosts and favs """
 from django.db import IntegrityError
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import models
+from .helpers import is_api_request
 
 
 # pylint: disable= no-self-use
@@ -23,6 +24,8 @@ class Favorite(View):
             # you already fav'ed that
             return HttpResponseBadRequest()
 
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -40,6 +43,8 @@ class Unfavorite(View):
             return HttpResponseNotFound()
 
         favorite.delete()
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -65,6 +70,8 @@ class Boost(View):
             privacy=status.privacy,
             user=request.user,
         )
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
 
 
@@ -80,4 +87,6 @@ class Unboost(View):
         ).first()
 
         boost.delete()
+        if is_api_request(request):
+            return HttpResponse()
         return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index e6ef52ba5..904e5f1cd 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -7,7 +7,7 @@ from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
 from django.db.models import Avg, Count, DecimalField, Q, Max
 from django.db.models.functions import Coalesce
-from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
+from django.http import HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.urls import reverse
@@ -35,6 +35,8 @@ class Lists(View):
                 item_count=Count("listitem", filter=Q(listitem__approved=True))
             )
             .filter(item_count__gt=0)
+            .select_related("user")
+            .prefetch_related("listitem_set")
             .order_by("-updated_date")
             .distinct()
         )
@@ -108,8 +110,7 @@ class List(View):
     def get(self, request, list_id):
         """display a book list"""
         book_list = get_object_or_404(models.List, id=list_id)
-        if not book_list.visible_to_user(request.user):
-            return HttpResponseNotFound()
+        book_list.raise_visible_to_user(request.user)
 
         if is_api_request(request):
             return ActivitypubResponse(book_list.to_activity(**request.GET))
@@ -190,6 +191,8 @@ class List(View):
     def post(self, request, list_id):
         """edit a list"""
         book_list = get_object_or_404(models.List, id=list_id)
+        book_list.raise_not_editable(request.user)
+
         form = forms.ListForm(request.POST, instance=book_list)
         if not form.is_valid():
             return redirect("list", book_list.id)
@@ -204,9 +207,7 @@ class Curate(View):
     def get(self, request, list_id):
         """display a pending list"""
         book_list = get_object_or_404(models.List, id=list_id)
-        if not book_list.user == request.user:
-            # only the creater can curate the list
-            return HttpResponseNotFound()
+        book_list.raise_not_editable(request.user)
 
         data = {
             "list": book_list,
@@ -220,6 +221,8 @@ class Curate(View):
     def post(self, request, list_id):
         """edit a book_list"""
         book_list = get_object_or_404(models.List, id=list_id)
+        book_list.raise_not_editable(request.user)
+
         suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
         approved = request.POST.get("approved") == "true"
         if approved:
@@ -260,13 +263,25 @@ def unsave_list(request, list_id):
     return redirect("list", list_id)
 
 
+@require_POST
+@login_required
+def delete_list(request, list_id):
+    """delete a list"""
+    book_list = get_object_or_404(models.List, id=list_id)
+
+    # only the owner or a moderator can delete a list
+    book_list.raise_not_deletable(request.user)
+
+    book_list.delete()
+    return redirect("lists")
+
+
 @require_POST
 @login_required
 def add_book(request):
     """put a book on a list"""
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
-    if not book_list.visible_to_user(request.user):
-        return HttpResponseNotFound()
+    book_list.raise_visible_to_user(request.user)
 
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
@@ -307,23 +322,21 @@ def add_book(request):
     path = reverse("list", args=[book_list.id])
     params = request.GET.copy()
     params["updated"] = True
-    return redirect("{:s}?{:s}".format(path, urlencode(params)))
+    return redirect(f"{path}?{urlencode(params)}")
 
 
 @require_POST
 @login_required
 def remove_book(request, list_id):
     """remove a book from a list"""
+    book_list = get_object_or_404(models.List, id=list_id)
+    item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
+    item.raise_not_deletable(request.user)
+
     with transaction.atomic():
-        book_list = get_object_or_404(models.List, id=list_id)
-        item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
-
-        if not book_list.user == request.user and not item.user == request.user:
-            return HttpResponseNotFound()
-
         deleted_order = item.order
         item.delete()
-    normalize_book_list_ordering(book_list.id, start=deleted_order)
+        normalize_book_list_ordering(book_list.id, start=deleted_order)
     return redirect("list", list_id)
 
 
@@ -334,34 +347,32 @@ def set_book_position(request, list_item_id):
     Action for when the list user manually specifies a list position, takes
     special care with the unique ordering per list.
     """
+    list_item = get_object_or_404(models.ListItem, id=list_item_id)
+    list_item.book_list.raise_not_editable(request.user)
+    try:
+        int_position = int(request.POST.get("position"))
+    except ValueError:
+        return HttpResponseBadRequest("bad value for position. should be an integer")
+
+    if int_position < 1:
+        return HttpResponseBadRequest("position cannot be less than 1")
+
+    book_list = list_item.book_list
+
+    # the max position to which a book may be set is the highest order for
+    # books which are approved
+    order_max = book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
+        "order__max"
+    ]
+
+    int_position = min(int_position, order_max)
+
+    original_order = list_item.order
+    if original_order == int_position:
+        # no change
+        return HttpResponse(status=204)
+
     with transaction.atomic():
-        list_item = get_object_or_404(models.ListItem, id=list_item_id)
-        try:
-            int_position = int(request.POST.get("position"))
-        except ValueError:
-            return HttpResponseBadRequest(
-                "bad value for position. should be an integer"
-            )
-
-        if int_position < 1:
-            return HttpResponseBadRequest("position cannot be less than 1")
-
-        book_list = list_item.book_list
-
-        # the max position to which a book may be set is the highest order for
-        # books which are approved
-        order_max = book_list.listitem_set.filter(approved=True).aggregate(
-            Max("order")
-        )["order__max"]
-
-        int_position = min(int_position, order_max)
-
-        if request.user not in (book_list.user, list_item.user):
-            return HttpResponseNotFound()
-
-        original_order = list_item.order
-        if original_order == int_position:
-            return HttpResponse(status=204)
         if original_order > int_position:
             list_item.order = -1
             list_item.save()
@@ -381,7 +392,7 @@ def set_book_position(request, list_item_id):
 def increment_order_in_reverse(
     book_list_id: int, start: int, end: Optional[int] = None
 ):
-    """increase the order nu,ber for every item in a list"""
+    """increase the order number for every item in a list"""
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
diff --git a/bookwyrm/views/login.py b/bookwyrm/views/login.py
new file mode 100644
index 000000000..e96d421a0
--- /dev/null
+++ b/bookwyrm/views/login.py
@@ -0,0 +1,81 @@
+""" class views for login/register views """
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.utils.translation import gettext_lazy as _
+from django.views import View
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.debug import sensitive_variables, sensitive_post_parameters
+
+from bookwyrm import forms, models
+from bookwyrm.settings import DOMAIN
+
+
+# pylint: disable=no-self-use
+@method_decorator(csrf_exempt, name="dispatch")
+class Login(View):
+    """authenticate an existing user"""
+
+    def get(self, request, confirmed=None):
+        """login page"""
+        if request.user.is_authenticated:
+            return redirect("/")
+        # send user to the login page
+        data = {
+            "show_confirmed_email": confirmed,
+            "login_form": forms.LoginForm(),
+            "register_form": forms.RegisterForm(),
+        }
+        return TemplateResponse(request, "login.html", data)
+
+    @sensitive_variables("password")
+    @method_decorator(sensitive_post_parameters("password"))
+    def post(self, request):
+        """authentication action"""
+        if request.user.is_authenticated:
+            return redirect("/")
+        login_form = forms.LoginForm(request.POST)
+
+        localname = login_form.data["localname"]
+        if "@" in localname:  # looks like an email address to me
+            try:
+                username = models.User.objects.get(email=localname).username
+            except models.User.DoesNotExist:  # maybe it's a full username?
+                username = localname
+        else:
+            username = f"{localname}@{DOMAIN}"
+        password = login_form.data["password"]
+
+        # perform authentication
+        user = authenticate(request, username=username, password=password)
+        if user is not None:
+            # successful login
+            login(request, user)
+            user.update_active_date()
+            if request.POST.get("first_login"):
+                return redirect("get-started-profile")
+            return redirect(request.GET.get("next", "/"))
+
+        # maybe the user is pending email confirmation
+        if models.User.objects.filter(
+            username=username, is_active=False, deactivation_reason="pending"
+        ).exists():
+            return redirect("confirm-email")
+
+        # login errors
+        login_form.non_field_errors = _("Username or password are incorrect")
+        register_form = forms.RegisterForm()
+        data = {"login_form": login_form, "register_form": register_form}
+        return TemplateResponse(request, "login.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+class Logout(View):
+    """log out"""
+
+    def get(self, request):
+        """done with this place! outa here!"""
+        logout(request)
+        return redirect("/")
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index b96bc9259..d6897f390 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -29,4 +29,4 @@ class Notifications(View):
     def post(self, request):
         """permanently delete notification for user"""
         request.user.notification_set.filter(read=True).delete()
-        return redirect("/notifications")
+        return redirect("notifications")
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 6d202ce24..b9cb99ded 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -27,7 +27,9 @@ class PasswordResetRequest(View):
         """create a password reset token"""
         email = request.POST.get("email")
         try:
-            user = models.User.objects.get(email=email, email__isnull=False)
+            user = models.User.viewer_aware_objects(request.user).get(
+                email=email, email__isnull=False
+            )
         except models.User.DoesNotExist:
             data = {"error": _("No user with that email address was found.")}
             return TemplateResponse(request, "password_reset_request.html", data)
@@ -38,7 +40,7 @@ class PasswordResetRequest(View):
         # create a new reset code
         code = models.PasswordReset.objects.create(user=user)
         password_reset_email(code)
-        data = {"message": _("A password reset link sent to %s" % email)}
+        data = {"message": _(f"A password reset link sent to {email}")}
         return TemplateResponse(request, "password_reset_request.html", data)
 
 
@@ -52,9 +54,9 @@ class PasswordReset(View):
         try:
             reset_code = models.PasswordReset.objects.get(code=code)
             if not reset_code.valid():
-                raise PermissionDenied
+                raise PermissionDenied()
         except models.PasswordReset.DoesNotExist:
-            raise PermissionDenied
+            raise PermissionDenied()
 
         return TemplateResponse(request, "password_reset.html", {"code": code})
 
@@ -97,9 +99,9 @@ class ChangePassword(View):
         confirm_password = request.POST.get("confirm-password")
 
         if new_password != confirm_password:
-            return redirect("preferences/password")
+            return redirect("prefs-password")
 
         request.user.set_password(new_password)
         request.user.save(broadcast=False, update_fields=["password"])
         login(request, request.user)
-        return redirect(request.user.local_path)
+        return redirect("user-feed", request.user.localname)
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 9100e1d43..02ee0a189 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -5,7 +5,8 @@ import dateutil.tz
 from dateutil.parser import ParserError
 
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.db import transaction
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -13,7 +14,7 @@ from django.views import View
 from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
-from .helpers import get_edition, handle_reading_status
+from .helpers import get_edition, handle_reading_status, is_api_request
 
 
 @method_decorator(login_required, name="dispatch")
@@ -31,10 +32,11 @@ class ReadingStatus(View):
         }.get(status)
         if not template:
             return HttpResponseNotFound()
+        # redirect if we're already on this shelf
         return TemplateResponse(request, f"reading_progress/{template}", {"book": book})
 
     def post(self, request, status, book_id):
-        """desire a book"""
+        """Change the state of a book by shelving it and adding reading dates"""
         identifier = {
             "want": models.Shelf.TO_READ,
             "start": models.Shelf.READING,
@@ -43,36 +45,44 @@ class ReadingStatus(View):
         if not identifier:
             return HttpResponseBadRequest()
 
-        desired_shelf = models.Shelf.objects.filter(
-            identifier=identifier, user=request.user
-        ).first()
-
-        book = get_edition(book_id)
-
-        current_status_shelfbook = (
-            models.ShelfBook.objects.select_related("shelf")
-            .filter(
-                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-                user=request.user,
-                book=book,
-            )
-            .first()
+        desired_shelf = get_object_or_404(
+            models.Shelf, identifier=identifier, user=request.user
         )
+
+        book = (
+            models.Edition.viewer_aware_objects(request.user)
+            .prefetch_related("shelfbook_set__shelf")
+            .get(id=book_id)
+        )
+
+        # gets the first shelf that indicates a reading status, or None
+        shelves = [
+            s
+            for s in book.current_shelves
+            if s.shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS
+        ]
+        current_status_shelfbook = shelves[0] if shelves else None
+
+        # checking the referer prevents redirecting back to the modal page
+        referer = request.headers.get("Referer", "/")
+        referer = "/" if "reading-status" in referer else referer
         if current_status_shelfbook is not None:
             if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
                 current_status_shelfbook.delete()
             else:  # It already was on the shelf
-                return redirect(request.headers.get("Referer", "/"))
+                return redirect(referer)
 
         models.ShelfBook.objects.create(
             book=book, shelf=desired_shelf, user=request.user
         )
 
-        if desired_shelf.identifier != models.Shelf.TO_READ:
-            # update or create a readthrough
-            readthrough = update_readthrough(request, book=book)
-            if readthrough:
-                readthrough.save()
+        update_readthrough_on_shelve(
+            request.user,
+            book,
+            desired_shelf.identifier,
+            start_date=request.POST.get("start_date"),
+            finish_date=request.POST.get("finish_date"),
+        )
 
         # post about it (if you want)
         if request.POST.get("post-status"):
@@ -88,20 +98,69 @@ class ReadingStatus(View):
                 privacy = request.POST.get("privacy")
                 handle_reading_status(request.user, desired_shelf, book, privacy)
 
-        return redirect(request.headers.get("Referer", "/"))
+        if is_api_request(request):
+            return HttpResponse()
+        return redirect(referer)
+
+
+@transaction.atomic
+def update_readthrough_on_shelve(
+    user, annotated_book, status, start_date=None, finish_date=None
+):
+    """update the current readthrough for a book when it is re-shelved"""
+    # there *should* only be one of current active readthrough, but it's a list
+    active_readthrough = next(iter(annotated_book.active_readthroughs), None)
+
+    # deactivate all existing active readthroughs
+    for readthrough in annotated_book.active_readthroughs:
+        readthrough.is_active = False
+        readthrough.save()
+
+    # if the state is want-to-read, deactivating existing readthroughs is all we need
+    if status == models.Shelf.TO_READ:
+        return
+
+    # if we're starting a book, we need a fresh clean active readthrough
+    if status == models.Shelf.READING or not active_readthrough:
+        active_readthrough = models.ReadThrough.objects.create(
+            user=user, book=annotated_book
+        )
+    # santiize and set dates
+    active_readthrough.start_date = load_date_in_user_tz_as_utc(start_date, user)
+    # if the finish date is set, the readthrough will be automatically set as inactive
+    active_readthrough.finish_date = load_date_in_user_tz_as_utc(finish_date, user)
+
+    active_readthrough.save()
 
 
 @login_required
 @require_POST
 def edit_readthrough(request):
     """can't use the form because the dates are too finnicky"""
-    readthrough = update_readthrough(request, create=False)
-    if not readthrough:
-        return HttpResponseNotFound()
+    readthrough = get_object_or_404(models.ReadThrough, id=request.POST.get("id"))
+    readthrough.raise_not_editable(request.user)
+
+    readthrough.start_date = load_date_in_user_tz_as_utc(
+        request.POST.get("start_date"), request.user
+    )
+    readthrough.finish_date = load_date_in_user_tz_as_utc(
+        request.POST.get("finish_date"), request.user
+    )
+
+    progress = request.POST.get("progress")
+    try:
+        progress = int(progress)
+        readthrough.progress = progress
+    except (ValueError, TypeError):
+        pass
+
+    progress_mode = request.POST.get("progress_mode")
+    try:
+        progress_mode = models.ProgressMode(progress_mode)
+        readthrough.progress_mode = progress_mode
+    except ValueError:
+        pass
 
-    # don't let people edit other people's data
-    if request.user != readthrough.user:
-        return HttpResponseBadRequest()
     readthrough.save()
 
     # record the progress update individually
@@ -116,10 +175,7 @@ def edit_readthrough(request):
 def delete_readthrough(request):
     """remove a readthrough"""
     readthrough = get_object_or_404(models.ReadThrough, id=request.POST.get("id"))
-
-    # don't let people edit other people's data
-    if request.user != readthrough.user:
-        return HttpResponseBadRequest()
+    readthrough.raise_not_deletable(request.user)
 
     readthrough.delete()
     return redirect(request.headers.get("Referer", "/"))
@@ -130,73 +186,32 @@ def delete_readthrough(request):
 def create_readthrough(request):
     """can't use the form because the dates are too finnicky"""
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
-    readthrough = update_readthrough(request, create=True, book=book)
-    if not readthrough:
-        return redirect(book.local_path)
-    readthrough.save()
-    return redirect(request.headers.get("Referer", "/"))
+
+    start_date = load_date_in_user_tz_as_utc(
+        request.POST.get("start_date"), request.user
+    )
+    finish_date = load_date_in_user_tz_as_utc(
+        request.POST.get("finish_date"), request.user
+    )
+    models.ReadThrough.objects.create(
+        user=request.user,
+        book=book,
+        start_date=start_date,
+        finish_date=finish_date,
+    )
+    return redirect("book", book.id)
 
 
 def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
     """ensures that data is stored consistently in the UTC timezone"""
-    user_tz = dateutil.tz.gettz(user.preferred_timezone)
-    start_date = dateutil.parser.parse(date_str, ignoretz=True)
-    return start_date.replace(tzinfo=user_tz).astimezone(dateutil.tz.UTC)
-
-
-def update_readthrough(request, book=None, create=True):
-    """updates but does not save dates on a readthrough"""
-    try:
-        read_id = request.POST.get("id")
-        if not read_id:
-            raise models.ReadThrough.DoesNotExist
-        readthrough = models.ReadThrough.objects.get(id=read_id)
-    except models.ReadThrough.DoesNotExist:
-        if not create or not book:
-            return None
-        readthrough = models.ReadThrough(
-            user=request.user,
-            book=book,
-        )
-
-    start_date = request.POST.get("start_date")
-    if start_date:
-        try:
-            readthrough.start_date = load_date_in_user_tz_as_utc(
-                start_date, request.user
-            )
-        except ParserError:
-            pass
-
-    finish_date = request.POST.get("finish_date")
-    if finish_date:
-        try:
-            readthrough.finish_date = load_date_in_user_tz_as_utc(
-                finish_date, request.user
-            )
-        except ParserError:
-            pass
-
-    progress = request.POST.get("progress")
-    if progress:
-        try:
-            progress = int(progress)
-            readthrough.progress = progress
-        except ValueError:
-            pass
-
-    progress_mode = request.POST.get("progress_mode")
-    if progress_mode:
-        try:
-            progress_mode = models.ProgressMode(progress_mode)
-            readthrough.progress_mode = progress_mode
-        except ValueError:
-            pass
-
-    if not readthrough.start_date and not readthrough.finish_date:
+    if not date_str:
+        return None
+    user_tz = dateutil.tz.gettz(user.preferred_timezone)
+    date = dateutil.parser.parse(date_str, ignoretz=True)
+    try:
+        return date.replace(tzinfo=user_tz).astimezone(dateutil.tz.UTC)
+    except ParserError:
         return None
-
-    return readthrough
 
 
 @login_required
@@ -204,10 +219,7 @@ def update_readthrough(request, book=None, create=True):
 def delete_progressupdate(request):
     """remove a progress update"""
     update = get_object_or_404(models.ProgressUpdate, id=request.POST.get("id"))
-
-    # don't let people edit other people's data
-    if request.user != update.user:
-        return HttpResponseBadRequest()
+    update.raise_not_deletable(request.user)
 
     update.delete()
     return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/register.py
similarity index 61%
rename from bookwyrm/views/authentication.py
rename to bookwyrm/views/register.py
index 70f51864d..dd8249203 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/register.py
@@ -1,90 +1,27 @@
 """ class views for login/register views """
-from django.contrib.auth import authenticate, login, logout
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth import login
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
-from django.utils import timezone
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext_lazy as _
-from django.views.decorators.csrf import csrf_exempt
-from django.views.decorators.http import require_POST
 from django.views import View
+from django.views.decorators.http import require_POST
+from django.views.decorators.debug import sensitive_variables, sensitive_post_parameters
 
 from bookwyrm import emailing, forms, models
 from bookwyrm.settings import DOMAIN
 
 
 # pylint: disable=no-self-use
-@method_decorator(csrf_exempt, name="dispatch")
-class Login(View):
-    """authenticate an existing user"""
-
-    def get(self, request, confirmed=None):
-        """login page"""
-        if request.user.is_authenticated:
-            return redirect("/")
-        # send user to the login page
-        data = {
-            "show_confirmed_email": confirmed,
-            "login_form": forms.LoginForm(),
-            "register_form": forms.RegisterForm(),
-        }
-        return TemplateResponse(request, "login.html", data)
-
-    def post(self, request):
-        """authentication action"""
-        if request.user.is_authenticated:
-            return redirect("/")
-        login_form = forms.LoginForm(request.POST)
-
-        localname = login_form.data["localname"]
-        if "@" in localname:  # looks like an email address to me
-            try:
-                username = models.User.objects.get(email=localname).username
-            except models.User.DoesNotExist:  # maybe it's a full username?
-                username = localname
-        else:
-            username = "%s@%s" % (localname, DOMAIN)
-        password = login_form.data["password"]
-
-        # perform authentication
-        user = authenticate(request, username=username, password=password)
-        if user is not None:
-            # successful login
-            login(request, user)
-            user.last_active_date = timezone.now()
-            user.save(broadcast=False, update_fields=["last_active_date"])
-            if request.POST.get("first_login"):
-                return redirect("get-started-profile")
-            return redirect(request.GET.get("next", "/"))
-
-        # maybe the user is pending email confirmation
-        if models.User.objects.filter(
-            username=username, is_active=False, deactivation_reason="pending"
-        ).exists():
-            return redirect("confirm-email")
-
-        # login errors
-        login_form.non_field_errors = _("Username or password are incorrect")
-        register_form = forms.RegisterForm()
-        data = {"login_form": login_form, "register_form": register_form}
-        return TemplateResponse(request, "login.html", data)
-
-
-@method_decorator(login_required, name="dispatch")
-class Logout(View):
-    """log out"""
-
-    def get(self, request):
-        """done with this place! outa here!"""
-        logout(request)
-        return redirect("/")
-
-
 class Register(View):
     """register a user"""
 
+    def get(self, request):  # pylint: disable=unused-argument
+        """whether or not you're logged in, just go to the home view"""
+        return redirect("/")
+
+    @sensitive_variables("password")
+    @method_decorator(sensitive_post_parameters("password"))
     def post(self, request):
         """join the server"""
         settings = models.SiteSettings.get()
@@ -92,11 +29,11 @@ class Register(View):
             invite_code = request.POST.get("invite_code")
 
             if not invite_code:
-                raise PermissionDenied
+                raise PermissionDenied()
 
             invite = get_object_or_404(models.SiteInvite, code=invite_code)
             if not invite.valid():
-                raise PermissionDenied
+                raise PermissionDenied()
         else:
             invite = None
 
@@ -109,6 +46,12 @@ class Register(View):
         email = form.data["email"]
         password = form.data["password"]
 
+        # make sure the email isn't blocked as spam
+        email_domain = email.split("@")[-1]
+        if models.EmailBlocklist.objects.filter(domain=email_domain).exists():
+            # treat this like a successful registration, but don't do anything
+            return redirect("confirm-email")
+
         # check localname and email uniqueness
         if models.User.objects.filter(localname=localname).first():
             form.errors["localname"] = ["User with this username already exists"]
@@ -125,7 +68,7 @@ class Register(View):
                 return TemplateResponse(request, "invite.html", data)
             return TemplateResponse(request, "login.html", data)
 
-        username = "%s@%s" % (localname, DOMAIN)
+        username = f"{localname}@{DOMAIN}"
         user = models.User.objects.create_user(
             username,
             email,
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index cdea86631..d8abdce5b 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -63,7 +63,7 @@ class Search(View):
                 data["results"] = paginated
                 data["remote"] = search_remote
 
-        return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
+        return TemplateResponse(request, f"search/{search_type}.html", data)
 
 
 def book_search(query, _, min_confidence, search_remote=False):
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index ba9f6a3c1..6e75cc999 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -1,11 +1,11 @@
-""" shelf views"""
+""" shelf views """
 from collections import namedtuple
 
-from django.db import IntegrityError
+from django.db import IntegrityError, transaction
 from django.db.models import OuterRef, Subquery, F
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -16,7 +16,7 @@ from django.views.decorators.http import require_POST
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import is_api_request, get_edition, get_user_from_username
+from .helpers import is_api_request, get_user_from_username
 from .helpers import privacy_filter
 
 
@@ -31,28 +31,28 @@ class Shelf(View):
         is_self = user == request.user
 
         if is_self:
-            shelves = user.shelf_set
+            shelves = user.shelf_set.all()
         else:
-            shelves = privacy_filter(request.user, user.shelf_set)
+            shelves = privacy_filter(request.user, user.shelf_set).all()
 
         # get the shelf and make sure the logged in user should be able to see it
         if shelf_identifier:
-            try:
-                shelf = user.shelf_set.get(identifier=shelf_identifier)
-            except models.Shelf.DoesNotExist:
-                return HttpResponseNotFound()
-            if not shelf.visible_to_user(request.user):
-                return HttpResponseNotFound()
+            shelf = get_object_or_404(user.shelf_set, identifier=shelf_identifier)
+            shelf.raise_visible_to_user(request.user)
             books = shelf.books
-        # this is a constructed "all books" view, with a fake "shelf" obj
         else:
+            # this is a constructed "all books" view, with a fake "shelf" obj
             FakeShelf = namedtuple(
                 "Shelf", ("identifier", "name", "user", "books", "privacy")
             )
-            books = models.Edition.objects.filter(
-                # privacy is ensured because the shelves are already filtered above
-                shelfbook__shelf__in=shelves.all()
-            ).distinct()
+            books = (
+                models.Edition.viewer_aware_objects(request.user)
+                .filter(
+                    # privacy is ensured because the shelves are already filtered above
+                    shelfbook__shelf__in=shelves
+                )
+                .distinct()
+            )
             shelf = FakeShelf("all", _("All books"), user, books, "public")
 
         if is_api_request(request):
@@ -82,7 +82,7 @@ class Shelf(View):
         data = {
             "user": user,
             "is_self": is_self,
-            "shelves": shelves.all(),
+            "shelves": shelves,
             "shelf": shelf,
             "books": page,
             "page_range": paginated.get_elided_page_range(
@@ -96,13 +96,11 @@ class Shelf(View):
     # pylint: disable=unused-argument
     def post(self, request, username, shelf_identifier):
         """edit a shelf"""
-        try:
-            shelf = request.user.shelf_set.get(identifier=shelf_identifier)
-        except models.Shelf.DoesNotExist:
-            return HttpResponseNotFound()
+        user = get_user_from_username(request.user, username)
+        shelf = get_object_or_404(user.shelf_set, identifier=shelf_identifier)
+        shelf.raise_not_editable(request.user)
 
-        if request.user != shelf.user:
-            return HttpResponseBadRequest()
+        # you can't change the name of the default shelves
         if not shelf.editable and request.POST.get("name") != shelf.name:
             return HttpResponseBadRequest()
 
@@ -130,8 +128,7 @@ def create_shelf(request):
 def delete_shelf(request, shelf_id):
     """user generated shelves"""
     shelf = get_object_or_404(models.Shelf, id=shelf_id)
-    if request.user != shelf.user or not shelf.editable:
-        return HttpResponseBadRequest()
+    shelf.raise_not_deletable()
 
     shelf.delete()
     return redirect("user-shelves", request.user.localname)
@@ -139,25 +136,28 @@ def delete_shelf(request, shelf_id):
 
 @login_required
 @require_POST
+@transaction.atomic
 def shelve(request):
     """put a book on a user's shelf"""
-    book = get_edition(request.POST.get("book"))
-
-    desired_shelf = models.Shelf.objects.filter(
-        identifier=request.POST.get("shelf"), user=request.user
-    ).first()
-    if not desired_shelf:
-        return HttpResponseNotFound()
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
+    desired_shelf = get_object_or_404(
+        request.user.shelf_set, identifier=request.POST.get("shelf")
+    )
 
+    # first we need to remove from the specified shelf
     change_from_current_identifier = request.POST.get("change-shelf-from")
-    if change_from_current_identifier is not None:
-        current_shelf = models.Shelf.objects.get(
-            user=request.user, identifier=change_from_current_identifier
-        )
-        handle_unshelve(book, current_shelf)
+    if change_from_current_identifier:
+        # find the shelfbook obj and delete it
+        get_object_or_404(
+            models.ShelfBook,
+            book=book,
+            user=request.user,
+            shelf__identifier=change_from_current_identifier,
+        ).delete()
 
     # A book can be on multiple shelves, but only on one read status shelf at a time
     if desired_shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS:
+        # figure out where state shelf it's currently on (if any)
         current_read_status_shelfbook = (
             models.ShelfBook.objects.select_related("shelf")
             .filter(
@@ -172,14 +172,16 @@ def shelve(request):
                 current_read_status_shelfbook.shelf.identifier
                 != desired_shelf.identifier
             ):
-                handle_unshelve(book, current_read_status_shelfbook.shelf)
+                current_read_status_shelfbook.delete()
             else:  # It is already on the shelf
                 return redirect(request.headers.get("Referer", "/"))
 
+        # create the new shelf-book entry
         models.ShelfBook.objects.create(
             book=book, shelf=desired_shelf, user=request.user
         )
     else:
+        # we're putting it on a custom shelf
         try:
             models.ShelfBook.objects.create(
                 book=book, shelf=desired_shelf, user=request.user
@@ -194,15 +196,12 @@ def shelve(request):
 @login_required
 @require_POST
 def unshelve(request):
-    """put a  on a user's shelf"""
-    book = models.Edition.objects.get(id=request.POST["book"])
-    current_shelf = models.Shelf.objects.get(id=request.POST["shelf"])
+    """put a on a user's shelf"""
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
+    shelf_book = get_object_or_404(
+        models.ShelfBook, book=book, shelf__id=request.POST["shelf"]
+    )
+    shelf_book.raise_not_deletable(request.user)
 
-    handle_unshelve(book, current_shelf)
+    shelf_book.delete()
     return redirect(request.headers.get("Referer", "/"))
-
-
-def handle_unshelve(book, shelf):
-    """unshelve a book"""
-    row = models.ShelfBook.objects.get(book=book, shelf=shelf)
-    row.delete()
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 651021b63..3da8c7258 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -1,18 +1,22 @@
 """ what are we here for if not for posting """
 import re
+from urllib.parse import urlparse
+
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseBadRequest
+from django.core.validators import URLValidator
+from django.core.exceptions import ValidationError
+from django.http import HttpResponse, HttpResponseBadRequest, Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
-from markdown import markdown
 
+from markdown import markdown
 from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
 from bookwyrm.utils import regex
-from .helpers import handle_remote_webfinger
+from .helpers import handle_remote_webfinger, is_api_request
 from .reading import edit_readthrough
 
 
@@ -22,7 +26,7 @@ class CreateStatus(View):
     """the view for *posting*"""
 
     def get(self, request, status_type):  # pylint: disable=unused-argument
-        """compose view (used for delete-and-redraft"""
+        """compose view (used for delete-and-redraft)"""
         book = get_object_or_404(models.Edition, id=request.GET.get("book"))
         data = {"book": book}
         return TemplateResponse(request, "compose.html", data)
@@ -32,10 +36,12 @@ class CreateStatus(View):
         status_type = status_type[0].upper() + status_type[1:]
 
         try:
-            form = getattr(forms, "%sForm" % status_type)(request.POST)
+            form = getattr(forms, f"{status_type}Form")(request.POST)
         except AttributeError:
             return HttpResponseBadRequest()
         if not form.is_valid():
+            if is_api_request(request):
+                return HttpResponse(status=500)
             return redirect(request.headers.get("Referer", "/"))
 
         status = form.save(commit=False)
@@ -52,8 +58,8 @@ class CreateStatus(View):
 
             # turn the mention into a link
             content = re.sub(
-                r"%s([^@]|$)" % mention_text,
-                r'<a href="%s">%s</a>\g<1>' % (mention_user.remote_id, mention_text),
+                rf"{mention_text}([^@]|$)",
+                rf'<a href="{mention_user.remote_id}">{mention_text}</a>\g<1>',
                 content,
             )
         # add reply parent to mentions
@@ -73,8 +79,13 @@ class CreateStatus(View):
         status.save(created=True)
 
         # update a readthorugh, if needed
-        edit_readthrough(request)
+        try:
+            edit_readthrough(request)
+        except Http404:
+            pass
 
+        if is_api_request(request):
+            return HttpResponse()
         return redirect("/")
 
 
@@ -87,8 +98,7 @@ class DeleteStatus(View):
         status = get_object_or_404(models.Status, id=status_id)
 
         # don't let people delete other people's statuses
-        if status.user != request.user and not request.user.has_perm("moderate_post"):
-            return HttpResponseBadRequest()
+        status.raise_not_deletable(request.user)
 
         # perform deletion
         status.delete()
@@ -104,12 +114,8 @@ class DeleteAndRedraft(View):
         status = get_object_or_404(
             models.Status.objects.select_subclasses(), id=status_id
         )
-        if isinstance(status, (models.GeneratedNote, models.ReviewRating)):
-            return HttpResponseBadRequest()
-
         # don't let people redraft other people's statuses
-        if status.user != request.user:
-            return HttpResponseBadRequest()
+        status.raise_not_editable(request.user)
 
         status_type = status.status_type.lower()
         if status.reply_parent:
@@ -149,17 +155,54 @@ def find_mentions(content):
 
 def format_links(content):
     """detect and format links"""
-    return re.sub(
-        r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,@#])*))' % regex.DOMAIN,
-        r'\g<1><a href="\g<2>">\g<3></a>',
-        content,
-    )
+    validator = URLValidator()
+    formatted_content = ""
+    split_content = re.split(r"(\s+)", content)
+
+    for potential_link in split_content:
+        if not potential_link:
+            continue
+        wrapped = _wrapped(potential_link)
+        if wrapped:
+            wrapper_close = potential_link[-1]
+            formatted_content += potential_link[0]
+            potential_link = potential_link[1:-1]
+
+        try:
+            # raises an error on anything that's not a valid link
+            validator(potential_link)
+
+            # use everything but the scheme in the presentation of the link
+            url = urlparse(potential_link)
+            link = url.netloc + url.path + url.params
+            if url.query != "":
+                link += "?" + url.query
+            if url.fragment != "":
+                link += "#" + url.fragment
+
+            formatted_content += f'<a href="{potential_link}">{link}</a>'
+        except (ValidationError, UnicodeError):
+            formatted_content += potential_link
+
+        if wrapped:
+            formatted_content += wrapper_close
+
+    return formatted_content
+
+
+def _wrapped(text):
+    """check if a line of text is wrapped"""
+    wrappers = [("(", ")"), ("[", "]"), ("{", "}")]
+    for wrapper in wrappers:
+        if text[0] == wrapper[0] and text[-1] == wrapper[-1]:
+            return True
+    return False
 
 
 def to_markdown(content):
     """catch links and convert to markdown"""
-    content = markdown(content)
     content = format_links(content)
+    content = markdown(content)
     # sanitize resulting html
     sanitizer = InputHtmlParser()
     sanitizer.feed(content)
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 87e42b4e9..fb553228b 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,8 +1,12 @@
 """ non-interactive pages """
+from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.http import Http404
+from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.views import View
+from django.views.decorators.http import require_POST
 
 from bookwyrm import models
 from bookwyrm.activitypub import ActivitypubResponse
@@ -56,16 +60,30 @@ class User(View):
                 request.user,
                 user.status_set.select_subclasses(),
             )
-            .select_related("reply_parent")
-            .prefetch_related("mention_books", "mention_users")
+            .select_related(
+                "user",
+                "reply_parent",
+                "review__book",
+                "comment__book",
+                "quotation__book",
+            )
+            .prefetch_related(
+                "mention_books",
+                "mention_users",
+                "attachments",
+            )
         )
 
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(
             user=user, year=timezone.now().year
         ).first()
-        if goal and not goal.visible_to_user(request.user):
-            goal = None
+        if goal:
+            try:
+                goal.raise_visible_to_user(request.user)
+            except Http404:
+                goal = None
+
         data = {
             "user": user,
             "is_self": is_self,
@@ -118,3 +136,12 @@ class Following(View):
             "follow_list": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
+
+
+@require_POST
+@login_required
+def hide_suggestions(request):
+    """not everyone wants user suggestions"""
+    request.user.show_suggested_users = False
+    request.user.save(broadcast=False, update_fields=["show_suggested_users"])
+    return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py
index 2462c5a49..0f8604412 100644
--- a/bookwyrm/views/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -3,12 +3,13 @@
 from dateutil.relativedelta import relativedelta
 from django.http import HttpResponseNotFound
 from django.http import JsonResponse
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.views.decorators.http import require_GET
 
 from bookwyrm import models
-from bookwyrm.settings import DOMAIN, VERSION
+from bookwyrm.settings import DOMAIN, VERSION, MEDIA_FULL_URL
 
 
 @require_GET
@@ -19,14 +20,11 @@ def webfinger(request):
         return HttpResponseNotFound()
 
     username = resource.replace("acct:", "")
-    try:
-        user = models.User.objects.get(username=username)
-    except models.User.DoesNotExist:
-        return HttpResponseNotFound("No account found")
+    user = get_object_or_404(models.User, username__iexact=username)
 
     return JsonResponse(
         {
-            "subject": "acct:%s" % (user.username),
+            "subject": f"acct:{user.username}",
             "links": [
                 {
                     "rel": "self",
@@ -46,7 +44,7 @@ def nodeinfo_pointer(_):
             "links": [
                 {
                     "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
-                    "href": "https://%s/nodeinfo/2.0" % DOMAIN,
+                    "href": f"https://{DOMAIN}/nodeinfo/2.0",
                 }
             ]
         }
@@ -56,17 +54,17 @@ def nodeinfo_pointer(_):
 @require_GET
 def nodeinfo(_):
     """basic info about the server"""
-    status_count = models.Status.objects.filter(user__local=True).count()
-    user_count = models.User.objects.filter(local=True).count()
+    status_count = models.Status.objects.filter(user__local=True, deleted=False).count()
+    user_count = models.User.objects.filter(is_active=True, local=True).count()
 
     month_ago = timezone.now() - relativedelta(months=1)
     last_month_count = models.User.objects.filter(
-        local=True, last_active_date__gt=month_ago
+        is_active=True, local=True, last_active_date__gt=month_ago
     ).count()
 
     six_months_ago = timezone.now() - relativedelta(months=6)
     six_month_count = models.User.objects.filter(
-        local=True, last_active_date__gt=six_months_ago
+        is_active=True, local=True, last_active_date__gt=six_months_ago
     ).count()
 
     site = models.SiteSettings.get()
@@ -91,25 +89,28 @@ def nodeinfo(_):
 @require_GET
 def instance_info(_):
     """let's talk about your cool unique instance"""
-    user_count = models.User.objects.filter(local=True).count()
-    status_count = models.Status.objects.filter(user__local=True).count()
+    user_count = models.User.objects.filter(is_active=True, local=True).count()
+    status_count = models.Status.objects.filter(user__local=True, deleted=False).count()
 
     site = models.SiteSettings.get()
+    logo_path = site.logo or "images/logo.png"
+    logo = f"{MEDIA_FULL_URL}{logo_path}"
     return JsonResponse(
         {
             "uri": DOMAIN,
             "title": site.name,
-            "short_description": "",
+            "short_description": site.instance_short_description,
             "description": site.instance_description,
-            "version": "0.0.1",
+            "version": VERSION,
             "stats": {
                 "user_count": user_count,
                 "status_count": status_count,
             },
-            "thumbnail": "https://%s/static/images/logo.png" % DOMAIN,
+            "thumbnail": logo,
             "languages": ["en"],
             "registrations": site.allow_registration,
-            "approval_required": False,
+            "approval_required": site.allow_registration and site.allow_invite_requests,
+            "email": site.admin_email,
         }
     )
 
@@ -117,7 +118,9 @@ def instance_info(_):
 @require_GET
 def peers(_):
     """list of federated servers this instance connects with"""
-    names = models.FederatedServer.objects.values_list("server_name", flat=True)
+    names = models.FederatedServer.objects.filter(status="federated").values_list(
+        "server_name", flat=True
+    )
     return JsonResponse(list(names), safe=False)
 
 
@@ -125,3 +128,14 @@ def peers(_):
 def host_meta(request):
     """meta of the host"""
     return TemplateResponse(request, "host_meta.xml", {"DOMAIN": DOMAIN})
+
+
+@require_GET
+def opensearch(request):
+    """Open Search xml spec"""
+    site = models.SiteSettings.get()
+    logo_path = site.favicon or "images/favicon.png"
+    logo = f"{MEDIA_FULL_URL}{logo_path}"
+    return TemplateResponse(
+        request, "opensearch.xml", {"image": logo, "DOMAIN": DOMAIN}
+    )
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index de5e56304..8e45db908 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import os
 
 from celery import Celery
-from . import settings
+from . import settings  # pylint: disable=unused-import
 
 
 # set the default Django settings module for the 'celery' program.
@@ -19,13 +19,3 @@ app.config_from_object("django.conf:settings", namespace="CELERY")
 
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()
-app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity")
-app.autodiscover_tasks(["bookwyrm"], related_name="activitystreams")
-app.autodiscover_tasks(["bookwyrm"], related_name="broadcast")
-app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector")
-app.autodiscover_tasks(["bookwyrm"], related_name="emailing")
-app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import")
-app.autodiscover_tasks(["bookwyrm"], related_name="preview_images")
-app.autodiscover_tasks(["bookwyrm"], related_name="models.user")
-app.autodiscover_tasks(["bookwyrm"], related_name="suggested_users")
-app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox")
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 107a39572..05ffdcabf 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -1,9 +1,20 @@
 """ bookwyrm settings and configuration """
+# pylint: disable=wildcard-import
+# pylint: disable=unused-wildcard-import
 from bookwyrm.settings import *
 
-CELERY_BROKER_URL = CELERY_BROKER
+CELERY_BROKER_URL = "redis://:{}@redis_broker:{}/0".format(
+    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
+)
+CELERY_RESULT_BACKEND = "redis://:{}@redis_broker:{}/0".format(
+    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
+)
+
+CELERY_DEFAULT_QUEUE = "low_priority"
+
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
+CELERY_RESULT_SERIALIZER = "json"
 FLOWER_PORT = env("FLOWER_PORT")
 
 INSTALLED_APPS = INSTALLED_APPS + [
diff --git a/docker-compose.yml b/docker-compose.yml
index 49d02e706..afa40b05e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,8 +20,6 @@ services:
       - pgdata:/var/lib/postgresql/data
     networks:
       - main
-    ports:
-      - 5432:5432
   web:
     build: .
     env_file: .env
@@ -63,7 +61,7 @@ services:
     build: .
     networks:
       - main
-    command: celery -A celerywyrm worker -l info
+    command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority
     volumes:
       - .:/app
       - static_volume:/app/static
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 543d53559..62c8d07fe 100644
Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 00fbd0e8b..cec74f9d9 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,72 +18,121 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
-msgstr ""
+msgstr "Reihenfolge der Liste"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
-msgstr ""
+msgstr "Sortieren nach"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 #, fuzzy
 #| msgid "Started reading"
 msgid "Ascending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 #, fuzzy
 #| msgid "Started reading"
 msgid "Descending"
 msgstr "Zu lesen angefangen"
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr ""
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:13
+#, fuzzy
+#| msgid "Started reading"
+msgid "Pending"
+msgstr "Zu lesen angefangen"
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:15
+#, fuzzy
+#| msgid "Moderator Comments"
+msgid "Moderator suspension"
+msgstr "Moderator:innenkommentare"
+
+#: bookwyrm/models/base_model.py:16
+#, fuzzy
+#| msgid "List curation:"
+msgid "Moderator deletion"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/models/base_model.py:17
+msgid "Domain block"
+msgstr ""
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr "Föderiert"
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked"
+msgstr "Blockierte Nutzer*innen"
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -94,29 +143,29 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 #, fuzzy
 #| msgid "Title"
 msgid "Books Timeline"
 msgstr "Titel"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 #, fuzzy
@@ -124,27 +173,27 @@ msgstr "Titel"
 msgid "Books"
 msgstr "Buch"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -180,23 +229,23 @@ msgstr ""
 
 #: bookwyrm/templates/author/author.html:45
 msgid "Born:"
-msgstr ""
+msgstr "Geboren"
 
 #: bookwyrm/templates/author/author.html:52
 msgid "Died:"
-msgstr ""
+msgstr "Gestorben"
 
 #: bookwyrm/templates/author/author.html:61
 msgid "Wikipedia"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
@@ -210,7 +259,7 @@ msgstr "In OpenLibrary ansehen"
 
 #: bookwyrm/templates/author/author.html:93
 msgid "View on Goodreads"
-msgstr ""
+msgstr "Auf Goodreads ansehen"
 
 #: bookwyrm/templates/author/author.html:108
 #, python-format
@@ -239,7 +288,7 @@ msgid "Last edited by:"
 msgstr "Zuletzt bearbeitet von:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Metadaten"
 
@@ -251,9 +300,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -284,7 +333,7 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -299,140 +348,142 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr "Speichern"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "von"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 #, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Deine Regale"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -440,15 +491,17 @@ msgstr "Orte"
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -457,24 +510,24 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -492,144 +545,144 @@ msgstr "Editionen von  %(book_title)s"
 msgid "Add Book"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Buchinfo bestätigen"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "Existiert \"%(name)s\" bereits als Autor:in?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, fuzzy, python-format
 #| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "\"<em>%(book_title)s</em>\" beginnen"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Neue:r Autor:in"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Neu als Autor:in erstellen: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "Ist das eine Edition eines vorhandenen Werkes?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Dies ist ein neues Werk."
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Zurück"
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Titel:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Seriennummer:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 #, fuzzy
 #| msgid "Pages:"
 msgid "Languages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 #, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
 msgstr "Veröffentlicht"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Author page for %(name)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:213
-msgid "John Doe, Jane Smith"
-msgstr ""
-
 #: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+msgid "John Doe, Jane Smith"
+msgstr "Max Mustermann, Maria Musterfrau"
+
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr ""
 
@@ -646,11 +699,11 @@ msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr ""
+msgstr "Beliebig"
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr ""
+msgstr "Sprache"
 
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
@@ -697,33 +750,40 @@ msgstr "bewertet"
 msgid "Progress Updates:"
 msgstr "Fortschrittsupdates:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Zeige alle Updates"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "Suchergebnisse"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -732,6 +792,10 @@ msgstr "Diese Lesedaten löschen"
 msgid "Close"
 msgstr "Schließen"
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr "Hilfe"
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 #, fuzzy
 #| msgid "Boost status"
@@ -752,34 +816,36 @@ msgstr "E-Mail Adresse"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:13
 msgid "A confirmation code has been sent to the email address you used to register your account."
-msgstr ""
+msgstr "Der Bestätigungscode um deinen Account zu registrieren wurde an die E-Mail-Adresse gesendet."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:15
 msgid "Sorry! We couldn't find that code."
-msgstr ""
+msgstr "Sorry! Dieser Code ist uns nicht bekannt."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 #, fuzzy
 #| msgid "Confirm password:"
 msgid "Confirmation code:"
 msgstr "Passwort bestätigen:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr "Absenden"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:32
 msgid "Can't find your code?"
-msgstr ""
+msgstr "Code nicht auffindbar?"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:4
 msgid "Resend confirmation link"
-msgstr ""
+msgstr "Bestätigungslink erneut senden"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -788,7 +854,7 @@ msgstr "E-Mail Adresse"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:17
 msgid "Resend link"
-msgstr ""
+msgstr "Link erneut senden"
 
 #: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
@@ -810,13 +876,13 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
-msgstr ""
+msgstr "Vereichnis"
 
 #: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
+msgstr "Mach dein Profil entdeckbar für andere User"
 
 #: bookwyrm/templates/directory/directory.html:24
 #, fuzzy, python-format
@@ -832,7 +898,7 @@ msgstr "Nachricht verwerfen"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr ""
+msgstr "Sortieren nach"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
 #, fuzzy
@@ -842,7 +908,7 @@ msgstr "Vorschlagen"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr ""
+msgstr "Zuletzt aktiv"
 
 #: bookwyrm/templates/directory/user_card.html:17
 #: bookwyrm/templates/directory/user_card.html:18
@@ -875,7 +941,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/user_card.html:61
 msgid "last active"
-msgstr ""
+msgstr "zuletzt aktiv"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
 #, fuzzy
@@ -885,15 +951,15 @@ msgstr "Nutzer*innenaktivität"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
-msgstr ""
+msgstr "Bookwyrmnutzer*innen"
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr ""
+msgstr "Alle bekannten Nutzer*innen"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 #, fuzzy
 #| msgid "Discard"
 msgid "Discover"
@@ -902,7 +968,7 @@ msgstr "Ablehnen"
 #: bookwyrm/templates/discover/discover.html:12
 #, python-format
 msgid "See what's new in the local %(site_name)s community"
-msgstr ""
+msgstr "Schau, was in der %(site_name)s Community neu ist"
 
 #: bookwyrm/templates/discover/large-book.html:46
 #: bookwyrm/templates/discover/small-book.html:32
@@ -935,7 +1001,7 @@ msgstr "Status favorisieren"
 #: bookwyrm/templates/email/confirm/text_content.html:4
 #, python-format
 msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:"
-msgstr ""
+msgstr "Als letzten Schritt bevor du %(site_name)s beitrittst - bestätige bitte deine Emailadresse indem du den Link klickst"
 
 #: bookwyrm/templates/email/confirm/html_content.html:11
 #, fuzzy
@@ -946,21 +1012,21 @@ msgstr "Bestätigen"
 #: bookwyrm/templates/email/confirm/html_content.html:15
 #, python-format
 msgid "Or enter the code \"<code>%(confirmation_code)s</code>\" at login."
-msgstr ""
+msgstr "Oder gibt den code \"<code>%(confirmation_code)s</code>\" beim Login ein."
 
 #: bookwyrm/templates/email/confirm/subject.html:2
 msgid "Please confirm your email"
-msgstr ""
+msgstr "Bitte bestätige deine E-Mail-Adresse"
 
 #: bookwyrm/templates/email/confirm/text_content.html:10
 #, python-format
 msgid "Or enter the code \"%(confirmation_code)s\" at login."
-msgstr ""
+msgstr "Oder gibt den code \"<code>%(confirmation_code)s</code>\" beim Login ein."
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr ""
+msgstr "Moin,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
@@ -969,7 +1035,7 @@ msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr ""
+msgstr "E-Mail Einstellungen"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
@@ -980,17 +1046,17 @@ msgstr "Über %(site_name)s"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
-msgstr ""
+msgstr "Tritt jetzt bei"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr ""
+msgstr "Erfahre mehr <a href=\"https://%(domain)s%(about_path)s\">über diese Instanz</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr ""
+msgstr "Du bist eingeladen, %(site_name)s beizutreten! Klicke auf den Link unten um einen Account zu erstellen."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 #, fuzzy
@@ -1002,7 +1068,7 @@ msgstr "Mehr über diese Seite"
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr ""
+msgstr "Du hast beantragt, dein %(site_name)s Passwort zu ändern. Klicke auf den Link unten, um ein neues Passwort zu erstellen und dich einzuloggen."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -1015,7 +1081,7 @@ msgstr "Passwort zurücksetzen!"
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
 msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr ""
+msgstr "Falls du dein Passwort gar nicht zurücksetzen wolltest, kannst du diese E-Mail ignorieren."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, fuzzy, python-format
@@ -1029,7 +1095,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -1044,7 +1110,7 @@ msgstr "Du hast momentan keine Nachrichten."
 #: bookwyrm/templates/feed/feed.html:22
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
-msgstr ""
+msgstr "lese <span data-poll=\"stream/%(tab_key)s\">0</span> ungelesene Status"
 
 #: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -1064,22 +1130,23 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
 msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Gelesen"
 
@@ -1089,10 +1156,18 @@ msgstr "Gelesen"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Leseziel"
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr ""
+msgstr "Wem noch folgen?"
+
+#: bookwyrm/templates/feed/suggested_users.html:9
+msgid "Don't show suggested users"
+msgstr "Keine vorgeschlagenen User anzeigen"
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+msgid "View directory"
+msgstr "Zeige Verzeichnis"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, fuzzy, python-format
@@ -1107,12 +1182,11 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Keine Bücher für \"%(query)s\" gefunden"
@@ -1120,13 +1194,13 @@ msgstr "Keine Bücher für \"%(query)s\" gefunden"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
+msgstr "Du kannst Bücher hinzufügen, wenn du %(site_name)s benutzt."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1156,7 +1230,7 @@ msgid "Save &amp; continue"
 msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr "Willkommen"
 
@@ -1168,7 +1242,7 @@ msgstr "Über %(site_name)s"
 
 #: bookwyrm/templates/get_started/layout.html:17
 msgid "These are some first steps to get you started."
-msgstr ""
+msgstr "Hier sind die ersten Schritte für den Einstieg."
 
 #: bookwyrm/templates/get_started/layout.html:31
 #: bookwyrm/templates/get_started/profile.html:6
@@ -1191,7 +1265,7 @@ msgstr "Freundlich"
 
 #: bookwyrm/templates/get_started/layout.html:45
 msgid "Skip this step"
-msgstr ""
+msgstr "Schritt überspringen"
 
 #: bookwyrm/templates/get_started/layout.html:49
 #, fuzzy
@@ -1211,7 +1285,7 @@ msgstr "Bio:"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr ""
+msgstr "Etwas über dich"
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
@@ -1219,18 +1293,18 @@ msgid "Avatar:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr "Folgende manuell bestätigen"
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
-msgstr ""
+msgstr "Diesen Account in vorgeschlagenen Usern zeigen"
 
 #: bookwyrm/templates/get_started/profile.html:52
 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Dein Account wird im Verzeichnis gezeigt und möglicherweise anderen Usern vorgeschlagen."
 
 #: bookwyrm/templates/get_started/users.html:11
 #, fuzzy
@@ -1273,127 +1347,132 @@ msgstr "Deine Bücher %(year)s"
 msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Bücher importieren"
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 #, fuzzy
 #| msgid "Data source"
 msgid "Data source:"
 msgstr "Datenquelle"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr "Bewertungen importieren"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importieren"
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr "Keine aktuellen Importe"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr "Importstatus"
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to imports"
 msgstr "Zurück zu den Meldungen"
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr "Import gestartet:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr "Import abgeschlossen:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr "AUFGABE GESCHEITERT"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr "Import läuft noch."
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr "(Aktualisiere für ein Update!)"
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen."
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr "Punkte erneut versuchen"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr "Erfolgreich importiert"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 #, fuzzy
 #| msgid "Import still in progress."
 msgid "Import Progress"
 msgstr "Import läuft noch."
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr "Buch"
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Titel"
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr "Importiert"
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr "Du kannst dir deine GoodReads Daten von <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> in deinem GoodReads Account runterladen."
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr "Erstelle einen Account"
 
@@ -1405,19 +1484,6 @@ msgstr "Zugiff verweigert"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Suchergebnisse für \"%(query)s\""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Passende Bücher"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1437,132 +1503,151 @@ msgstr "Datenschutzerklärung"
 msgid "Recent Books"
 msgstr "Aktive Bücher"
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr "Dezentral"
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr "Freundlich"
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr "Tritt %(name)s bei"
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Diese Instanz ist geschlossen"
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr ""
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
-msgstr ""
+msgstr "Einladung beantragen"
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, fuzzy, python-format
+#| msgid "(Recommended if registration is open)"
+msgid "%(name)s registration is closed"
+msgstr "(Vorschlagen falls die Registrierung offen ist)"
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr "Danke! Deine Anfrage ist eingegangen."
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a book, user, or list"
 msgstr "Suche nach Buch oder Benutzer*in"
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 #, fuzzy
 #| msgid "Your books"
 msgid "Your Books"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully posted status"
+msgstr "Erfolgreich importiert"
+
+#: bookwyrm/templates/layout.html:220
+#, fuzzy
+#| msgid "Boost status"
+msgid "Error posting status"
+msgstr "Status teilen"
+
+#: bookwyrm/templates/layout.html:228
 #, fuzzy
 #| msgid "About this server"
 msgid "About this instance"
 msgstr "Über diesen Server"
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 #, fuzzy
 #| msgid "List curation:"
 msgid "Documentation"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1604,8 +1689,29 @@ msgstr "Bestätigen"
 msgid "Discard"
 msgstr "Ablehnen"
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+#, fuzzy
+#| msgid "Delete this progress update"
+msgid "Delete this list?"
+msgstr "Dieses Fortschrittsupdate löschen"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This action cannot be un-done"
+msgstr "Dieses Regal ist leer."
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Löschen"
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr "Liste bearbeiten"
 
@@ -1640,9 +1746,15 @@ msgstr "Offen"
 msgid "Anyone can add books to this list"
 msgstr "Alle können Bücher hinzufügen"
 
+#: bookwyrm/templates/lists/form.html:49
+#, fuzzy
+#| msgid "Delete status"
+msgid "Delete list"
+msgstr "Post löschen"
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
-msgstr ""
+msgstr "Du hast erfolgreich ein Buch für diese Liste vorgeschlagen!"
 
 #: bookwyrm/templates/lists/list.html:22
 #, fuzzy
@@ -1715,28 +1827,42 @@ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 msgid "Suggest"
 msgstr "Vorschlagen"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "Speichern"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Deine Listen"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "Listen"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "Liste erstellen"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
-msgstr ""
+msgstr "Alles klar! E-Mai- Adresse bestätigt."
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Passwort:"
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr "Kontaktiere für eine Einladung eine*n Admin"
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
@@ -1819,7 +1945,7 @@ msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
@@ -2009,6 +2135,7 @@ msgstr "Neues Passwort:"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 #, fuzzy
 #| msgid "Create an Account"
 msgid "Delete Account"
@@ -2016,11 +2143,11 @@ msgstr "Erstelle einen Account"
 
 #: bookwyrm/templates/preferences/delete_user.html:12
 msgid "Permanently delete account"
-msgstr ""
+msgstr "Account permanent löschen"
 
 #: bookwyrm/templates/preferences/delete_user.html:14
 msgid "Deleting your account cannot be undone. The username will not be available to register in the future."
-msgstr ""
+msgstr "Das Löschen des Accounts kann nicht rückgängig gemacht werden. Der Username kann nicht erneut registriert werden."
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 #: bookwyrm/templates/preferences/edit_user.html:7
@@ -2028,29 +2155,38 @@ msgid "Edit Profile"
 msgstr "Profil bearbeiten:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
+#, fuzzy
+#| msgid "Show set reading goal prompt in feed:"
+msgid "Show reading goal prompt in feed:"
 msgstr "Angegebenes Leseziel im Feed anzeigen."
 
+#: bookwyrm/templates/preferences/edit_user.html:50
+#, fuzzy
+#| msgid "Suggest Books"
+msgid "Show suggested users:"
+msgstr "Bücher vorschlagen"
+
 #: bookwyrm/templates/preferences/edit_user.html:58
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "Dein Account wird im <a href=\"%(path)s\">directory</a> angezeigt und eventuell anderen Usern empfohlen."
+
+#: bookwyrm/templates/preferences/edit_user.html:68
 #, fuzzy
 #| msgid "Goal privacy:"
 msgid "Default post privacy:"
 msgstr "Sichtbarkeit des Ziels"
 
-#: bookwyrm/templates/preferences/edit_user.html:70
-#, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
-msgstr ""
+msgstr "Bevorzugte Zeitzone:"
 
 #: bookwyrm/templates/preferences/layout.html:11
 msgid "Account"
 msgstr ""
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr "Profil"
 
@@ -2084,11 +2220,11 @@ msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
 #: bookwyrm/templates/search/book.html:68
 msgid "Manually add book"
-msgstr ""
+msgstr "Buch manuell hinzufügen"
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr ""
+msgstr "Log dich ein, um Bücher zu importieren oder hinzuzufügen."
 
 #: bookwyrm/templates/search/layout.html:16
 #, fuzzy
@@ -2104,7 +2240,9 @@ msgstr "Suche"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -2116,58 +2254,6 @@ msgstr ""
 msgid "No results found for \"%(query)s\""
 msgstr "Keine Liste für \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr "Nutzer*innen verwalten"
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-#, fuzzy
-#| msgid "Federated Servers"
-msgid "Federated Instances"
-msgstr "Föderierende Server"
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr "Instanzeinstellungen"
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr "Ankündigungen"
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr "Seiteneinstellungen"
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr "Instanzinformationen"
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr "Bilder"
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr "Inhalt des Footers"
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr "Registrierung"
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 #, fuzzy
@@ -2189,37 +2275,36 @@ msgstr "Zurück zu den Meldungen"
 msgid "Edit Announcement"
 msgstr "Ankündigungen"
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Löschen"
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
-msgstr ""
+msgstr "Sichtbar"
 
 #: bookwyrm/templates/settings/announcement.html:38
 msgid "True"
-msgstr ""
+msgstr "Ja"
 
 #: bookwyrm/templates/settings/announcement.html:40
 msgid "False"
-msgstr ""
+msgstr "Nein"
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 #, fuzzy
 #| msgid "Birth date:"
 msgid "Start date:"
 msgstr "Geburtsdatum:"
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 #, fuzzy
 #| msgid "Birth date:"
 msgid "End date:"
 msgstr "Geburtsdatum:"
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 #, fuzzy
 #| msgid "Activity"
 msgid "Active:"
@@ -2232,7 +2317,32 @@ msgstr "Aktivität"
 msgid "Create Announcement"
 msgstr "Ankündigungen"
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+#, fuzzy
+#| msgid "reviewed"
+msgid "Preview:"
+msgstr "bewertete"
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content:"
+msgstr "Inhalt des Footers"
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Event date:"
+msgstr "Geburtsdatum:"
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr "Ankündigungen"
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 #, fuzzy
 #| msgid "Added:"
 msgid "Date added"
@@ -2257,10 +2367,11 @@ msgid "End date"
 msgstr "Lesedaten bearbeiten"
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr ""
 
@@ -2276,6 +2387,106 @@ msgstr "Aktivität"
 msgid "inactive"
 msgstr "Aktivität"
 
+#: bookwyrm/templates/settings/announcements.html:54
+#, fuzzy
+#| msgid "Announcements"
+msgid "No announcements found."
+msgstr "Ankündigungen"
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:15
+#, fuzzy
+#| msgid "Max uses"
+msgid "Total users"
+msgstr "Maximale Benutzungen"
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:27
+#, fuzzy
+#| msgid "Import Status"
+msgid "Statuses"
+msgstr "Importstatus"
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] "%(count)d Benutzungen"
+msgstr[1] "%(count)d Benutzungen"
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] "%(count)d Benutzungen"
+msgstr[1] "%(count)d Benutzungen"
+
+#: bookwyrm/templates/settings/dashboard.html:65
+#, fuzzy
+#| msgid "User Activity"
+msgid "Instance Activity"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:87
+#, fuzzy
+#| msgid "One Week"
+msgid "Weeks"
+msgstr "Eine Woche"
+
+#: bookwyrm/templates/settings/dashboard.html:100
+#, fuzzy
+#| msgid "User Activity"
+msgid "User signup activity"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/settings/dashboard.html:106
+#, fuzzy
+#| msgid "User Activity"
+msgid "Status activity"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+#, fuzzy
+#| msgid "No statuses reported"
+msgid "Statuses posted"
+msgstr "Keine Beiträge gemeldet"
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr "Domain hinzufügen"
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2310,32 +2521,21 @@ msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 #, fuzzy
 #| msgid "Import Status"
 msgid "Status:"
 msgstr "Importstatus"
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Föderiert"
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-#, fuzzy
-#| msgid "Blocked Users"
-msgid "Blocked"
-msgstr "Blockierte Nutzer*innen"
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 #, fuzzy
 #| msgid "Description:"
 msgid "Version:"
@@ -2345,6 +2545,37 @@ msgstr "Beschreibung:"
 msgid "Notes:"
 msgstr ""
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+#, fuzzy
+#| msgid "Import Books"
+msgid "Email Blocklist"
+msgstr "Bücher importieren"
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr "Wenn sich jemand mit einer E-Mail-Adresse von dieser Domain zu registrieren versucht, wird kein Account erstellt. Die Registrierung wird so aussehen als hätte sie funktioniert."
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+#, fuzzy
+#| msgid "Notifications"
+msgid "Options"
+msgstr "Benachrichtigungen"
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] "%(count)d Benutzungen"
+msgstr[1] "%(count)d Benutzungen"
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr ""
@@ -2361,9 +2592,10 @@ msgstr ""
 #: bookwyrm/templates/settings/federated_server.html:46
 #: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
-msgstr ""
+msgstr "Alle anzeigen"
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports:"
@@ -2388,7 +2620,7 @@ msgid "Blocked by us:"
 msgstr "Blockierte Nutzer*innen"
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr ""
 
@@ -2423,23 +2655,108 @@ msgstr ""
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
+msgstr "Föderierende Server"
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 #, fuzzy
 #| msgid "Instance Name:"
 msgid "Instance name"
 msgstr "Instanzname"
 
-#: bookwyrm/templates/settings/federation.html:23
-#, fuzzy
-#| msgid "Federated"
-msgid "Date federated"
-msgstr "Föderiert"
-
-#: bookwyrm/templates/settings/federation.html:27
+#: bookwyrm/templates/settings/federation.html:40
 msgid "Software"
 msgstr ""
 
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+#, fuzzy
+#| msgid "Email address:"
+msgid "Add IP address"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP Address:"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+#, fuzzy
+#| msgid "Import Books"
+msgid "IP Address Blocklist"
+msgstr "Bücher importieren"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+#, fuzzy
+#| msgid "Email address:"
+msgid "Address"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr "Nutzer*innen verwalten"
+
+#: bookwyrm/templates/settings/layout.html:51
+#, fuzzy
+#| msgid "List curation:"
+msgid "Moderation"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr "Instanzeinstellungen"
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "Seiteneinstellungen"
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "Instanzinformationen"
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr "Bilder"
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr "Inhalt des Footers"
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
+msgstr "Registrierung"
+
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2451,7 +2768,7 @@ msgstr "Einladungen"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr ""
+msgstr "Ignorierte Einladungsanfragen"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
 #, fuzzy
@@ -2491,28 +2808,28 @@ msgstr "Annehmen"
 #: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr ""
+msgstr "Gesendet"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr ""
+msgstr "Angefragt"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
-msgstr ""
+msgstr "Einladung senden"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
-msgstr ""
+msgstr "Einladung erneut senden"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorieren"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
-msgstr ""
+msgstr "Un-ignorieren"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:108
 #, fuzzy
@@ -2522,7 +2839,7 @@ msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr ""
+msgstr "Zeige ignorierte Anfragen"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
@@ -2579,7 +2896,7 @@ msgstr "Erfolgreich importiert"
 
 #: bookwyrm/templates/settings/server_blocklist.html:32
 msgid "Failed:"
-msgstr ""
+msgstr "Fehlgeschlagen"
 
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
@@ -2594,65 +2911,81 @@ msgid "Instance description:"
 msgstr "Instanzbeschreibung"
 
 #: bookwyrm/templates/settings/site.html:27
+#, fuzzy
+#| msgid "Description:"
+msgid "Short description:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr "Datenschutzerklärung"
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr "Logo klein"
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr "Unterstützungslink"
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr "Unterstützungstitel"
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
-msgstr ""
+msgstr "Zusätzliche Info:"
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 #, fuzzy
 #| msgid "Allow registration:"
 msgid "Allow registration"
 msgstr "Registrierungen erlauben"
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 #, fuzzy
 #| msgid "Follow Requests"
 msgid "Allow invite requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/settings/site.html:97
-msgid "Require users to confirm email address"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:99
-msgid "(Recommended if registration is open)"
-msgstr ""
-
 #: bookwyrm/templates/settings/site.html:102
+msgid "Require users to confirm email address"
+msgstr "User müssen ihre E-Mail-Adresse bestätigen"
+
+#: bookwyrm/templates/settings/site.html:104
+msgid "(Recommended if registration is open)"
+msgstr "(Vorschlagen falls die Registrierung offen ist)"
+
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
+#: bookwyrm/templates/settings/site.html:111
+#, fuzzy
+#| msgid "Invites"
+msgid "Invite request text:"
+msgstr "Einladungen"
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -2666,7 +2999,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
@@ -2702,57 +3035,59 @@ msgstr "Zitieren"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:15
 msgid "Some thoughts on the book"
-msgstr ""
+msgstr "Ein paar Gedanken zum Buch"
 
 #: bookwyrm/templates/snippets/create_status/comment.html:26
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr "Antwort"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #, fuzzy
 #| msgid "Footer Content"
 msgid "Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Spoileralarm:"
-
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content warning:"
+msgstr "Inhalt des Footers"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr "Spoileralarm!"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 #, fuzzy
 #| msgid "Comment"
@@ -2766,29 +3101,47 @@ msgstr "Kommentieren"
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr "Absenden"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 #, fuzzy
 #| msgid "Quote"
 msgid "Quote:"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Editionen von  %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "Seiten"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "Prozent"
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "Editionen von  %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 #, fuzzy
 #| msgid "Review"
 msgid "Review:"
@@ -2803,13 +3156,13 @@ msgstr "Diese Lesedaten löschen?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
-msgstr ""
+msgstr "Favorisieren"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2823,11 +3176,11 @@ msgstr "Weniger anzeigen"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr ""
+msgstr "Filter ausblenden"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr ""
+msgstr "Filter anwenden"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 #, fuzzy
@@ -2865,12 +3218,19 @@ msgstr "Entfolgen"
 msgid "Accept"
 msgstr "Annehmen"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "Kein Rating"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, python-format
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2903,7 +3263,7 @@ msgstr[1] ""
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr ""
+msgstr "Review von \"%(book_title)s\": %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -3014,14 +3374,14 @@ msgstr "Zu lesen angefangen"
 #: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 msgid "Finished reading"
-msgstr "Lesen abgeschlossen"
+msgstr "Zu Ende gelesen"
 
 #: bookwyrm/templates/snippets/reading_modals/form.html:8
 msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -3065,38 +3425,60 @@ msgstr "Deine Bücher"
 msgid "More shelves"
 msgstr "Mehr Regale"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr "Zu lesen beginnen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr "Lesen abschließen"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove from %(name)s"
 msgstr "Listen: %(username)s"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr "Lesen abschließen"
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
-msgstr "Mehr anzeigen"
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content warning"
+msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
-msgstr "Weniger anzeigen"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+#, fuzzy
+#| msgid "Like status"
+msgid "Show status"
+msgstr "Status favorisieren"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "(Page %(page)s)"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "%(percent)s%% komplett!"
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+#, fuzzy
+#| msgid "Like status"
+msgid "Hide status"
+msgstr "Status favorisieren"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
@@ -3177,7 +3559,7 @@ msgstr "Diese Lesedaten löschen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr "Direktnachricht senden"
 
@@ -3218,6 +3600,14 @@ msgstr "Zu lesen angefangen"
 msgid "Sorted descending"
 msgstr "Zu lesen angefangen"
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr "Mehr anzeigen"
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr "Weniger anzeigen"
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Benutzerprofil"
@@ -3273,40 +3663,52 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
 msgstr "Bücher"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr "(zeige %(start)s-%(end)s)"
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -3322,7 +3724,7 @@ msgstr "Alle %(size)s anzeigen"
 
 #: bookwyrm/templates/user/user.html:46
 msgid "View all books"
-msgstr ""
+msgstr "Zeige alle Bücher"
 
 #: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
@@ -3367,7 +3769,23 @@ msgstr[1] "folgt dir"
 msgid "No followers you follow"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+msgid "Permanently delete user"
+msgstr "User permanent löschen"
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr "Bist du sicher, dass du <strong>%(username)s</strong>s Account löschen möchtest? Diese Aktion kann nicht rückgängig gemacht werden. Zur Bestätigung gib bitte dein Passwort ein."
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Your password:"
+msgstr "Passwort bestätigen:"
+
+#: bookwyrm/templates/user_admin/user.html:8
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to users"
@@ -3394,7 +3812,7 @@ msgstr "Hinzugefügt:"
 
 #: bookwyrm/templates/user_admin/user_admin.html:30
 msgid "Last Active"
-msgstr ""
+msgstr "Zuletzt aktiv"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
 #, fuzzy
@@ -3403,75 +3821,127 @@ msgid "Remote instance"
 msgstr "Instanzname"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 #, fuzzy
 #| msgid "Activity"
 msgid "Active"
 msgstr "Aktivität"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
-msgstr ""
+msgstr "Inaktiv"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
-msgstr ""
+msgstr "Nicht gesetzt"
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr ""
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 #, fuzzy
 #| msgid "User Profile"
 msgid "View user profile"
 msgstr "Benutzerprofil"
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr "Lokal"
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote"
+msgstr "Entfernen"
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+#, fuzzy
+#| msgid "Email address:"
+msgid "Email:"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+msgid "(View reports)"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by count:"
+msgstr "Blockierte Nutzer*innen"
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Last active date:"
+msgstr "Geburtsdatum:"
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+#, fuzzy
+#| msgid "Manually approve followers:"
+msgid "Manually approved followers:"
+msgstr "Folgende manuell bestätigen"
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+#, fuzzy
+#| msgid "Discard"
+msgid "Discoverable:"
+msgstr "Ablehnen"
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+#, fuzzy
+#| msgid "Deactivate user"
+msgid "Deactivation reason:"
+msgstr "Nutzer:in deaktivieren"
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 #, fuzzy
 #| msgid "Instance Settings"
 msgid "Instance details"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:5
 msgid "Permanently deleted"
-msgstr ""
+msgstr "Permanent gelöscht"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr ""
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr ""
-
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
 msgid "Not a valid csv file"
 msgstr "E-Mail Adresse"
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr "Username oder Passwort sind falsch"
+
 #: bookwyrm/views/password.py:32
 #, fuzzy
 #| msgid "A user with that username already exists."
@@ -3481,21 +3951,38 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr ""
+msgstr "Ein Passwortwiederherstellungslinl wurde zu %s gesendet"
 
 #: bookwyrm/views/rss_feed.py:34
 #, python-brace-format
 msgid "Status updates from {obj.display_name}"
-msgstr ""
+msgstr "Status updates von {obj.display_name}"
+
+#~ msgid "This instance is closed"
+#~ msgstr "Diese Instanz ist geschlossen"
+
+#~ msgid "Contact an administrator to get an invite"
+#~ msgstr "Kontaktiere für eine Einladung eine*n Admin"
+
+#~ msgid "Spoiler alert:"
+#~ msgstr "Spoileralarm:"
+
+#, fuzzy
+#~| msgid "Federated"
+#~ msgid "Date federated"
+#~ msgstr "Föderiert"
+
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Suchergebnisse für \"%(query)s\""
+
+#~ msgid "Matching Books"
+#~ msgstr "Passende Bücher"
 
 #, fuzzy
 #~| msgid "Federated Servers"
 #~ msgid "Federated Timeline"
 #~ msgstr "Föderierende Server"
 
-#~ msgid "Local"
-#~ msgstr "Lokal"
-
 #, fuzzy
 #~| msgid "Lists: %(username)s"
 #~ msgid "Reports: <small>%(server_name)s</small>"
@@ -3572,11 +4059,6 @@ msgstr ""
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s ist keine gültige remote_id"
 
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field cannot be null."
-#~ msgstr "Dieses Regal ist leer."
-
 #, fuzzy
 #~| msgid "A user with that username already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
@@ -3597,11 +4079,6 @@ msgstr ""
 #~ msgid "Decimal number"
 #~ msgstr "Seriennummer:"
 
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Listenkuratierung:"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Email address"
@@ -3622,11 +4099,6 @@ msgstr ""
 #~ msgid "IPv4 address"
 #~ msgstr "E-Mail Adresse"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "E-Mail Adresse"
-
 #, fuzzy
 #~| msgid "No active invites"
 #~ msgid "Positive integer"
@@ -3806,9 +4278,6 @@ msgstr ""
 #~ msgid "by %(author)s"
 #~ msgstr "von %(author)s"
 
-#~ msgid "Deactivate user"
-#~ msgstr "Nutzer:in deaktivieren"
-
 #~ msgid "Reactivate user"
 #~ msgstr "Nutzer:in reaktivieren"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ac2acf350..a9daa819b 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.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -18,62 +18,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 msgid "Ascending"
 msgstr ""
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 msgid "Descending"
 msgstr ""
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr ""
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:13
+msgid "Pending"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:15
+msgid "Moderator suspension"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:16
+msgid "Moderator deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:17
+msgid "Domain block"
+msgstr ""
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr ""
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+msgid "Blocked"
+msgstr ""
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -84,53 +125,53 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 msgid "Books Timeline"
 msgstr ""
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr ""
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr ""
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -177,12 +218,12 @@ msgid "Wikipedia"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr ""
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr ""
 
@@ -219,7 +260,7 @@ msgid "Last edited by:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr ""
 
@@ -231,9 +272,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr ""
 
@@ -262,7 +303,7 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr ""
 
@@ -275,127 +316,129 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -403,13 +446,15 @@ msgstr ""
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr ""
 
@@ -418,22 +463,22 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr ""
 
@@ -448,133 +493,133 @@ msgstr ""
 msgid "Add Book"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr ""
 
@@ -640,33 +685,38 @@ msgstr ""
 msgid "Progress Updates:"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr ""
 
+#: bookwyrm/templates/book/search_filter.html:5
+msgid "Search editions"
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -675,6 +725,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr ""
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
 msgstr ""
@@ -696,12 +750,14 @@ msgid "Sorry! We couldn't find that code."
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 msgid "Confirmation code:"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr ""
 
@@ -714,7 +770,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -739,7 +795,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
 msgstr ""
 
@@ -811,7 +867,7 @@ msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 msgid "Discover"
 msgstr ""
 
@@ -937,7 +993,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr ""
 
@@ -972,18 +1028,19 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr ""
 
@@ -993,11 +1050,19 @@ msgstr ""
 msgid "%(year)s Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
+#: bookwyrm/templates/feed/suggested_users.html:9
+msgid "Don't show suggested users"
+msgstr ""
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+msgid "View directory"
+msgstr ""
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1008,12 +1073,11 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
@@ -1027,7 +1091,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1054,7 +1118,7 @@ msgid "Save &amp; continue"
 msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr ""
 
@@ -1108,12 +1172,12 @@ msgid "Avatar:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
 msgstr ""
 
@@ -1160,121 +1224,126 @@ msgstr ""
 msgid "%(username)s's %(year)s Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 msgid "Data source:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 msgid "Back to imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 msgid "Import Progress"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr ""
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr ""
 
@@ -1286,19 +1355,6 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr ""
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr ""
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1318,126 +1374,138 @@ msgstr ""
 msgid "Recent Books"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr ""
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr ""
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
 msgstr ""
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, python-format
+msgid "%(name)s registration is closed"
+msgstr ""
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+msgid "Search for a book, user, or list"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Your Books"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+msgid "Successfully posted status"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:220
+msgid "Error posting status"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:228
 msgid "About this instance"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 msgid "Documentation"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1477,8 +1545,25 @@ msgstr ""
 msgid "Discard"
 msgstr ""
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+msgid "Delete this list?"
+msgstr ""
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+msgid "This action cannot be un-done"
+msgstr ""
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr ""
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr ""
 
@@ -1513,6 +1598,10 @@ msgstr ""
 msgid "Anyone can add books to this list"
 msgstr ""
 
+#: bookwyrm/templates/lists/form.html:49
+msgid "Delete list"
+msgstr ""
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
@@ -1577,28 +1666,36 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
+#: bookwyrm/templates/lists/list_items.html:15
+msgid "Saved"
+msgstr ""
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr ""
 
+#: bookwyrm/templates/lists/lists.html:35
+msgid "All Lists"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:39
+msgid "Saved Lists"
+msgstr ""
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
 msgstr ""
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr ""
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr ""
 
@@ -1672,7 +1769,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 msgid "Reports"
 msgstr ""
 
@@ -1852,6 +1949,7 @@ msgstr ""
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 msgid "Delete Account"
 msgstr ""
 
@@ -1869,19 +1967,23 @@ msgid "Edit Profile"
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
+msgid "Show reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:50
+msgid "Show suggested users:"
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Default post privacy:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:70
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:68
+msgid "Default post privacy:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
 msgstr ""
 
@@ -1890,6 +1992,7 @@ msgid "Account"
 msgstr ""
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr ""
 
@@ -1934,7 +2037,9 @@ msgstr ""
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1945,56 +2050,6 @@ msgstr ""
 msgid "No results found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Instances"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr ""
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
@@ -2010,12 +2065,6 @@ msgstr ""
 msgid "Edit Announcement"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr ""
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
 msgstr ""
@@ -2029,14 +2078,19 @@ msgid "False"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 msgid "Start date:"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 msgid "End date:"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 msgid "Active:"
 msgstr ""
 
@@ -2045,7 +2099,26 @@ msgstr ""
 msgid "Create Announcement"
 msgstr ""
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+msgid "Preview:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+msgid "Content:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+msgid "Event date:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr ""
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 msgid "Date added"
 msgstr ""
 
@@ -2062,10 +2135,11 @@ msgid "End date"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr ""
 
@@ -2077,6 +2151,88 @@ msgstr ""
 msgid "inactive"
 msgstr ""
 
+#: bookwyrm/templates/settings/announcements.html:54
+msgid "No announcements found."
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:15
+msgid "Total users"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:27
+msgid "Statuses"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, python-format
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, python-format
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/settings/dashboard.html:65
+msgid "Instance Activity"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:87
+msgid "Weeks"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:100
+msgid "User signup activity"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:106
+msgid "Status activity"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+msgid "Statuses posted"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2103,28 +2259,19 @@ msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 msgid "Status:"
 msgstr ""
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr ""
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-msgid "Blocked"
-msgstr ""
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 msgid "Version:"
 msgstr ""
 
@@ -2132,6 +2279,32 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+msgid "Email Blocklist"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+msgid "Options"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, python-format
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr ""
@@ -2151,6 +2324,7 @@ msgid "View all"
 msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 msgid "Reports:"
 msgstr ""
 
@@ -2167,7 +2341,7 @@ msgid "Blocked by us:"
 msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr ""
 
@@ -2198,17 +2372,92 @@ msgstr ""
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+msgid "Federated Instances"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Instance name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:23
-msgid "Date federated"
+#: bookwyrm/templates/settings/federation.html:40
+msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:27
-msgid "Software"
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+msgid "Add IP address"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+msgid "IP Address:"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+msgid "IP Address Blocklist"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+msgid "Address"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:51
+msgid "Moderation"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
 msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
@@ -2347,61 +2596,73 @@ msgid "Instance description:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:27
+msgid "Short description:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 msgid "Allow registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 msgid "Allow invite requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:102
 msgid "Require users to confirm email address"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:104
 msgid "(Recommended if registration is open)"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:102
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr ""
 
+#: bookwyrm/templates/settings/site.html:111
+msgid "Invite request text:"
+msgstr ""
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2414,7 +2675,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr ""
 
@@ -2450,48 +2711,48 @@ msgstr ""
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+msgid "Content warning:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr ""
@@ -2503,25 +2764,37 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+msgid "Position:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+msgid "On page:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+msgid "At percent:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
 msgstr ""
 
@@ -2534,13 +2807,13 @@ msgstr ""
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr ""
 
@@ -2586,12 +2859,19 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, python-format
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2739,7 +3019,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
 msgstr ""
 
@@ -2777,37 +3057,51 @@ msgstr ""
 msgid "More shelves"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
+msgid "Content warning"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+msgid "Show status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, python-format
+msgid "(Page %(page)s)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, python-format
+msgid "(%(percent)s%%)"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+msgid "Hide status"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2878,7 +3172,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr ""
 
@@ -2913,6 +3207,14 @@ msgstr ""
 msgid "Sorted descending"
 msgstr ""
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr ""
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr ""
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr ""
@@ -2967,38 +3269,50 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr ""
 
@@ -3055,7 +3369,21 @@ msgstr[1] ""
 msgid "No followers you follow"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+msgid "Permanently delete user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+msgid "Your password:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user.html:8
 msgid "Back to users"
 msgstr ""
 
@@ -3082,31 +3410,69 @@ msgid "Remote instance"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 msgid "Active"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr ""
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 msgid "View user profile"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+msgid "Remote"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+msgid "Email:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+msgid "(View reports)"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+msgid "Blocked by count:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+msgid "Last active date:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+msgid "Manually approved followers:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+msgid "Discoverable:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+msgid "Deactivation reason:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 msgid "Instance details"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr ""
 
@@ -3114,35 +3480,35 @@ msgstr ""
 msgid "Permanently deleted"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr ""
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr ""
-
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr ""
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a7b3e1812..b84642435 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 04497a2a1..05bc44d21 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Reese Porter <reesedporter@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,62 +18,103 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese correo electrónico."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 msgid "Descending"
 msgstr "Descendente"
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr "Error en cargar libro"
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr "No se pudo encontrar el libro"
+
+#: bookwyrm/models/base_model.py:13
+msgid "Pending"
+msgstr "Pendiente"
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr "Auto-eliminación"
+
+#: bookwyrm/models/base_model.py:15
+msgid "Moderator suspension"
+msgstr "Suspensión de moderador"
+
+#: bookwyrm/models/base_model.py:16
+msgid "Moderator deletion"
+msgstr "Eliminación de moderador"
+
+#: bookwyrm/models/base_model.py:17
+msgid "Domain block"
+msgstr "Bloqueo de dominio"
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr "Federalizado"
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+msgid "Blocked"
+msgstr "Bloqueado"
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -84,53 +125,53 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr "Línea temporal de hogar"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 msgid "Books Timeline"
 msgstr "Línea temporal de libros"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Libros"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
@@ -177,12 +218,12 @@ msgid "Wikipedia"
 msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "Ver en Inventaire"
 
@@ -219,7 +260,7 @@ msgid "Last edited by:"
 msgstr "Editado más recientemente por:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Metadatos"
 
@@ -231,9 +272,9 @@ msgid "Name:"
 msgstr "Nombre:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "Separar varios valores con comas."
 
@@ -262,7 +303,7 @@ msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "ID Inventaire:"
 
@@ -275,127 +316,129 @@ msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr "Guardar"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "por"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "Reseñas"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "Tus reseñas"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "Tus comentarios"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "Tus citas"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -403,13 +446,15 @@ msgstr "Lugares"
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "Agregar a lista"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr "Agregar"
 
@@ -418,22 +463,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -448,133 +493,133 @@ msgstr "Editar \"%(book_title)s\""
 msgid "Add Book"
 msgstr "Agregar libro"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Confirmar información de libro"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "¿Es \"%(name)s\" un autor ya existente?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Autor de <em>%(book_title)s</em>"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Este es un autor nuevo"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Creando un autor nuevo: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "¿Es esta una edición de una obra ya existente?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Esta es una obra nueva"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Volver"
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Título:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Subtítulo:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Número de serie:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "Idiomas:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "Editorial:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "Quitar %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "Página de autor por %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "ID OpenLibrary:"
 
@@ -640,33 +685,38 @@ msgstr "lo calificó con"
 msgid "Progress Updates:"
 msgstr "Actualizaciones de progreso:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "terminado"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Mostrar todas las actualizaciones"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
+#: bookwyrm/templates/book/search_filter.html:5
+msgid "Search editions"
+msgstr "Buscar ediciones"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -675,6 +725,10 @@ msgstr "Eliminar estas fechas de lectura"
 msgid "Close"
 msgstr "Cerrar"
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr "Ayuda"
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
 msgstr "Componer status"
@@ -696,12 +750,14 @@ msgid "Sorry! We couldn't find that code."
 msgstr "Sentimos que no pudimos encontrar ese código"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 msgid "Confirmation code:"
 msgstr "Código de confirmación:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr "Enviar"
 
@@ -714,7 +770,7 @@ msgid "Resend confirmation link"
 msgstr "Reenviar enlace de confirmación"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -739,7 +795,7 @@ msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
 msgstr "Directorio"
 
@@ -811,7 +867,7 @@ msgstr "Todos los usuarios conocidos"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 msgid "Discover"
 msgstr "Descubrir"
 
@@ -937,7 +993,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -950,10 +1006,9 @@ msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:22
-#, fuzzy, python-format
-#| msgid "load <span data-poll=\"stream/%(tab.key)s\">0</span> unread status(es)"
+#, python-format
 msgid "load <span data-poll=\"stream/%(tab_key)s\">0</span> unread status(es)"
-msgstr "cargar <span data-poll=\"stream/%(tab.key)s\">0</span> status(es) no leído(s)"
+msgstr "cargar <span data-poll=\"stream/%(tab_key)s\">0</span> status(es) no leído(s)"
 
 #: bookwyrm/templates/feed/feed.html:38
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -973,18 +1028,19 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Leido"
 
@@ -994,11 +1050,19 @@ msgstr "Leido"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Meta de lectura"
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "A quién seguir"
 
+#: bookwyrm/templates/feed/suggested_users.html:9
+msgid "Don't show suggested users"
+msgstr "No mostrar usuarios sugeridos"
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+msgid "View directory"
+msgstr "Ver directorio"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1009,12 +1073,11 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Buscar libros"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
@@ -1028,7 +1091,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1055,7 +1118,7 @@ msgid "Save &amp; continue"
 msgstr "Guardar &amp; continuar"
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr "Bienvenidos"
 
@@ -1109,12 +1172,12 @@ msgid "Avatar:"
 msgstr "Avatar:"
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr "Aprobar seguidores a mano:"
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
 msgstr "Mostrar esta cuenta en los usuarios sugeridos:"
 
@@ -1161,121 +1224,126 @@ msgstr "Tus libros de %(year)s"
 msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Importar libros"
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 msgid "Data source:"
 msgstr "Fuente de datos:"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr "Archivo de datos:"
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr "Incluir reseñas"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr "Configuración de privacidad para las reseñas importadas:"
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importar"
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr "No hay ninguna importación reciente"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr "Status de importación"
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 msgid "Back to imports"
 msgstr "Volver a las importaciones"
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr "Importación ha empezado:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr "Importación ha terminado:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr "TAREA FALLÓ"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr "Importación todavia en progreso"
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr "(¡Refresca para actualizar!)"
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr "No se pudo cargar"
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar."
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr "Renglón %(index)s: <strong>%(title)s</strong> por %(author)s"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr "Reintentar ítems"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr "Importado exitosamente"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 msgid "Import Progress"
 msgstr "Progreso de importación"
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr "Libro"
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Título"
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Autor/Autora"
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr "Importado"
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr "Puedes descargar tus datos de GoodReads de la <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Página de Exportación/Importación</a> de tu cuenta de GoodReads"
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr "Crear una cuenta"
 
@@ -1287,19 +1355,6 @@ msgstr "Permiso denegado"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "¡Disculpa! Este código de invitación no queda válido."
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Resultados de búsqueda"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Resultados de búsqueda por \"%(query)s\""
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Libros correspondientes"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1319,126 +1374,141 @@ msgstr "Política de privacidad"
 msgid "Recent Books"
 msgstr "Libros recientes"
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr "Descentralizado"
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr "Amigable"
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr "Anti-corporativo"
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr "Unirse con %(name)s"
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Esta instancia está cerrada."
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "¡Gracias! Tu solicitud ha sido recibido."
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
 msgstr "Solicitar una invitación"
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, fuzzy, python-format
+#| msgid "(Recommended if registration is open)"
+msgid "%(name)s registration is closed"
+msgstr "(Recomendado si la registración es abierta)"
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr "¡Gracias! Tu solicitud ha sido recibido."
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a book, user, or list"
 msgstr "Buscar un libro o un usuario"
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Your Books"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr "Unirse"
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+msgid "Successfully posted status"
+msgstr "Status publicado exitosamente"
+
+#: bookwyrm/templates/layout.html:220
+msgid "Error posting status"
+msgstr "Error en publicar status"
+
+#: bookwyrm/templates/layout.html:228
 msgid "About this instance"
 msgstr "Sobre esta instancia"
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 msgid "Documentation"
 msgstr "Documentación de Django"
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr "Des-guardar"
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1478,8 +1548,25 @@ msgstr "Aprobar"
 msgid "Discard"
 msgstr "Desechar"
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+msgid "Delete this list?"
+msgstr "¿Eliminar esta lista?"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+msgid "This action cannot be un-done"
+msgstr "Esta acción no se puede deshacer"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Eliminar"
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr "Editar lista"
 
@@ -1514,6 +1601,10 @@ msgstr "Abierto"
 msgid "Anyone can add books to this list"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
+#: bookwyrm/templates/lists/form.html:49
+msgid "Delete list"
+msgstr "Eliminar lista"
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr "¡Has sugerido un libro para esta lista exitosamente!"
@@ -1578,28 +1669,36 @@ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)
 msgid "Suggest"
 msgstr "Sugerir"
 
+#: bookwyrm/templates/lists/list_items.html:15
+msgid "Saved"
+msgstr "Guardado"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Tus listas"
 
+#: bookwyrm/templates/lists/lists.html:35
+msgid "All Lists"
+msgstr "Todas las listas"
+
+#: bookwyrm/templates/lists/lists.html:39
+msgid "Saved Lists"
+msgstr "Listas guardadas"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
 msgstr "¡Éxito! Dirección de correo electrónico confirmada."
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr "Contactar a unx administradorx para recibir una invitación"
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
@@ -1673,7 +1772,7 @@ msgstr "Informes: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 msgid "Reports"
 msgstr "Informes"
 
@@ -1853,6 +1952,7 @@ msgstr "Nueva contraseña:"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 msgid "Delete Account"
 msgstr "Quitar cuenta"
 
@@ -1870,19 +1970,23 @@ msgid "Edit Profile"
 msgstr "Editar perfil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
-msgstr "Mostrar meta de lectura en el feed:"
+msgid "Show reading goal prompt in feed:"
+msgstr "Mostrar sugerencia de meta de lectura en el feed:"
+
+#: bookwyrm/templates/preferences/edit_user.html:50
+msgid "Show suggested users:"
+msgstr "Mostrar usuarios sugeridos:"
 
 #: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Default post privacy:"
-msgstr "Privacidad de publicación por defecto:"
-
-#: bookwyrm/templates/preferences/edit_user.html:70
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm."
 
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:68
+msgid "Default post privacy:"
+msgstr "Privacidad de publicación por defecto:"
+
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
 msgstr "Huso horario preferido"
 
@@ -1891,6 +1995,7 @@ msgid "Account"
 msgstr "Cuenta"
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1935,7 +2040,9 @@ msgstr "Tipo de búsqueda"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1946,56 +2053,6 @@ msgstr "Usuarios"
 msgid "No results found for \"%(query)s\""
 msgstr "No se encontró ningún resultado correspondiente a \"%(query)s\""
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr "Adminstración"
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr "Administrar usuarios"
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Instances"
-msgstr "Instancias federalizadas"
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr "Configuración de instancia"
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr "Anuncios"
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr "Configuración de sitio"
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr "Información de instancia"
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr "Imagenes"
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr "Contenido del pie de página"
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr "Registración"
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
@@ -2011,12 +2068,6 @@ msgstr "Volver a la lista de servidores"
 msgid "Edit Announcement"
 msgstr "Editar anuncio"
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Eliminar"
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
 msgstr "Visible:"
@@ -2030,14 +2081,19 @@ msgid "False"
 msgstr "Falso"
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 msgid "Start date:"
 msgstr "Fecha de inicio:"
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 msgid "End date:"
 msgstr "Fecha final:"
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 msgid "Active:"
 msgstr "Activ@:"
 
@@ -2046,7 +2102,26 @@ msgstr "Activ@:"
 msgid "Create Announcement"
 msgstr "Crear anuncio"
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+msgid "Preview:"
+msgstr "Vista preliminar:"
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+msgid "Content:"
+msgstr "Contenido:"
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+msgid "Event date:"
+msgstr "Fecha de evento:"
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr "Anuncios"
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 msgid "Date added"
 msgstr "Fecha agregada"
 
@@ -2063,10 +2138,11 @@ msgid "End date"
 msgstr "Fecha final"
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr "Status"
 
@@ -2078,6 +2154,88 @@ msgstr "activo"
 msgid "inactive"
 msgstr "inactivo"
 
+#: bookwyrm/templates/settings/announcements.html:54
+msgid "No announcements found."
+msgstr "No se encontró ningun anuncio."
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr "Tablero"
+
+#: bookwyrm/templates/settings/dashboard.html:15
+msgid "Total users"
+msgstr "Número de usuarios"
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr "Activos este mes"
+
+#: bookwyrm/templates/settings/dashboard.html:27
+msgid "Statuses"
+msgstr "Statuses"
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr "Obras"
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, python-format
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] "%(display_count)s informe abierto"
+msgstr[1] "%(display_count)s informes abiertos"
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, python-format
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] "%(display_count)s solicitación de invitado"
+msgstr[1] "%(display_count)s solicitaciones de invitado"
+
+#: bookwyrm/templates/settings/dashboard.html:65
+msgid "Instance Activity"
+msgstr "Actividad de instancia"
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr "Intervalo:"
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr "Dias"
+
+#: bookwyrm/templates/settings/dashboard.html:87
+msgid "Weeks"
+msgstr "Semanas"
+
+#: bookwyrm/templates/settings/dashboard.html:100
+msgid "User signup activity"
+msgstr "Actividad de inscripciones de usuarios"
+
+#: bookwyrm/templates/settings/dashboard.html:106
+msgid "Status activity"
+msgstr "Actividad de status"
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+msgid "Statuses posted"
+msgstr "Statuses publicados"
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr "Suma"
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr "Agregar dominio"
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr "Dominio:"
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2104,28 +2262,19 @@ msgstr "Instancia:"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 msgid "Status:"
 msgstr "Status:"
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Federalizado"
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-msgid "Blocked"
-msgstr "Bloqueado"
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr "Software:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 msgid "Version:"
 msgstr "Versión:"
 
@@ -2133,6 +2282,32 @@ msgstr "Versión:"
 msgid "Notes:"
 msgstr "Notas:"
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+msgid "Email Blocklist"
+msgstr "Lista de bloqueo de correos electrónicos"
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr "Cuando alguien intenta registrarse con un correo electrónico de este dominio, ningun cuenta se creerá. El proceso de registración se parecerá a funcionado."
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr "Dominio"
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+msgid "Options"
+msgstr "Opciones"
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, python-format
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] "%(display_count)s usuario"
+msgstr[1] "%(display_count)s usuarios"
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "Detalles"
@@ -2152,6 +2327,7 @@ msgid "View all"
 msgstr "Ver todos"
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 msgid "Reports:"
 msgstr "Informes:"
 
@@ -2168,7 +2344,7 @@ msgid "Blocked by us:"
 msgstr "Bloqueado por nosotros:"
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr "Notas"
 
@@ -2199,19 +2375,102 @@ msgstr "Desbloquear"
 msgid "All users from this instance will be re-activated."
 msgstr "Todos los usuarios en esta instancia serán re-activados."
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+msgid "Federated Instances"
+msgstr "Instancias federalizadas"
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Instance name"
 msgstr "Nombre de instancia"
 
-#: bookwyrm/templates/settings/federation.html:23
-msgid "Date federated"
-msgstr "Fecha de federalización"
-
-#: bookwyrm/templates/settings/federation.html:27
+#: bookwyrm/templates/settings/federation.html:40
 msgid "Software"
 msgstr "Software"
 
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+#, fuzzy
+#| msgid "IP address"
+msgid "Add IP address"
+msgstr "Dirección IP"
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+#, fuzzy
+#| msgid "IP address"
+msgid "IP Address:"
+msgstr "Dirección IP"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "IP Address Blocklist"
+msgstr "Importar lista de bloqueo"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+#, fuzzy
+#| msgid "IP address"
+msgid "Address"
+msgstr "Dirección IP"
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr "Adminstración"
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr "Administrar usuarios"
+
+#: bookwyrm/templates/settings/layout.html:51
+msgid "Moderation"
+msgstr "Moderación"
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr "Configuración de instancia"
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "Configuración de sitio"
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "Información de instancia"
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr "Imagenes"
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr "Contenido del pie de página"
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
+msgstr "Registración"
+
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2348,61 +2607,75 @@ msgid "Instance description:"
 msgstr "Descripción de instancia:"
 
 #: bookwyrm/templates/settings/site.html:27
+msgid "Short description:"
+msgstr "Descripción corta:"
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr "Utilizado cuando la instancia se ve de una vista previa en joinbookwyrm.com. No es compatible con html o markdown."
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr "Código de conducta:"
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr "Política de privacidad:"
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr "Logo:"
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr "Logo pequeño:"
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr "Favicon:"
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr "Enlace de apoyo:"
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr "Título de apoyo:"
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr "Correo electrónico de administradorx:"
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
 msgstr "Más informacion:"
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 msgid "Allow registration"
 msgstr "Permitir registración"
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 msgid "Allow invite requests"
 msgstr "Permitir solicitudes de invitación"
 
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:102
 msgid "Require users to confirm email address"
 msgstr "Requerir a usuarios a confirmar dirección de correo electrónico"
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:104
 msgid "(Recommended if registration is open)"
 msgstr "(Recomendado si la registración es abierta)"
 
-#: bookwyrm/templates/settings/site.html:102
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
+#: bookwyrm/templates/settings/site.html:111
+#, fuzzy
+#| msgid "Invite Requests"
+msgid "Invite request text:"
+msgstr "Solicitudes de invitación"
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2415,7 +2688,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "Sin portada"
 
@@ -2451,48 +2724,50 @@ msgstr "Algunos pensamientos sobre el libro"
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr "Respuesta"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
 msgstr "Contenido"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Alerta de spoiler:"
-
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#, fuzzy
+#| msgid "Content:"
+msgid "Content warning:"
+msgstr "Contenido:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr "¡Advertencia, ya vienen spoilers!"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Comentario:"
@@ -2504,25 +2779,37 @@ msgstr "Comentario:"
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr "Compartir"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "Cita:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Un extracto de '%(book_title)s'"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+msgid "Position:"
+msgstr "Posición:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+msgid "On page:"
+msgstr "En la página:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+msgid "At percent:"
+msgstr "Al por ciento:"
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr "Tu reseña de '%(book_title)s'"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
 msgstr "Reseña:"
 
@@ -2535,13 +2822,13 @@ msgstr "¿Eliminar estas fechas de lectura?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "Me gusta"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "Quitar me gusta"
 
@@ -2587,12 +2874,19 @@ msgstr "Dejar de seguir"
 msgid "Accept"
 msgstr "Aceptar"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "No calificación"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, python-format
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] "%(half_rating)s estrella"
+msgstr[1] "%(half_rating)s estrellas"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2673,10 +2967,9 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
-#| msgid "page %(page)s"
+#, python-format
 msgid "page %(page)s"
-msgstr "página %(pages)s"
+msgstr "página %(page)s"
 
 #: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
@@ -2738,10 +3031,10 @@ msgstr "Lectura se terminó"
 
 #: bookwyrm/templates/snippets/reading_modals/form.html:8
 msgid "(Optional)"
-msgstr ""
+msgstr "(Opcional)"
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
 msgstr "Progreso de actualización"
 
@@ -2779,37 +3072,57 @@ msgstr "Mover libro"
 msgid "More shelves"
 msgstr "Más estantes"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr "Empezar leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr "Terminar de leer"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr "Quiero leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr "Terminar de leer"
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
-msgstr "Mostrar más"
+#, fuzzy
+#| msgid "Content:"
+msgid "Content warning"
+msgstr "Contenido:"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
-msgstr "Mostrar menos"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+#, fuzzy
+#| msgid "View status"
+msgid "Show status"
+msgstr "Ver status"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, python-format
+msgid "(Page %(page)s)"
+msgstr "(Página %(page)s)"
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, python-format
+msgid "(%(percent)s%%)"
+msgstr "(%(percent)s%%)"
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+#, fuzzy
+#| msgid "Like status"
+msgid "Hide status"
+msgstr "Me gusta status"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2880,7 +3193,7 @@ msgstr "Eliminar y recomponer"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr "Enviar mensaje directo"
 
@@ -2915,6 +3228,14 @@ msgstr "En orden ascendente"
 msgid "Sorted descending"
 msgstr "En orden descendente"
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr "Mostrar más"
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr "Mostrar menos"
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Perfil de usuario"
@@ -2969,38 +3290,50 @@ msgstr "Editar estante"
 msgid "Update shelf"
 msgstr "Actualizar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Todos los libros"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr "(mostrando %(start)s-%(end)s)"
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -3057,7 +3390,21 @@ msgstr[1] "%(mutuals_display)s seguidores que sigues"
 msgid "No followers you follow"
 msgstr "Ningún seguidor que tu sigues"
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+msgid "Permanently delete user"
+msgstr "Eliminar usuario permanentemente"
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr "¿Estás seguro que quieres eliminar la cuenta de <strong>%(username)s</strong>'s? Esta acción no se puede deshacer. Para continuar, por favor, ingrese tu contraseña para confirmar eliminación."
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+msgid "Your password:"
+msgstr "Tu contraseña:"
+
+#: bookwyrm/templates/user_admin/user.html:8
 msgid "Back to users"
 msgstr "Volver a usuarios"
 
@@ -3084,31 +3431,69 @@ msgid "Remote instance"
 msgstr "Instancia remota"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 msgid "Active"
 msgstr "Activ@"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
 msgstr "Inactiv@"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
 msgstr "No establecido"
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr "Detalles"
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 msgid "View user profile"
 msgstr "Ver perfil de usuario"
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr "Local"
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+msgid "Remote"
+msgstr "Remoto"
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr "Detalles"
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+msgid "Email:"
+msgstr "Correo electronico:"
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+msgid "(View reports)"
+msgstr "(Ver informes)"
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+msgid "Blocked by count:"
+msgstr "Recuento de usuarios que han bloqueado este usuario:"
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+msgid "Last active date:"
+msgstr "Fecha de actividad más reciente:"
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+msgid "Manually approved followers:"
+msgstr "Seguidores aprobados a mano:"
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+msgid "Discoverable:"
+msgstr "Reconocible:"
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+msgid "Deactivation reason:"
+msgstr "Razón de desactivación:"
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 msgid "Instance details"
 msgstr "Detalles de instancia"
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr "Ver instancia"
 
@@ -3116,35 +3501,35 @@ msgstr "Ver instancia"
 msgid "Permanently deleted"
 msgstr "Eliminado permanentemente"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr "Suspender usuario"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr "Des-suspender usuario"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "Archivo excede el tamaño máximo: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s: %(subtitle)s"
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr "Nombre de usuario o contraseña es incorrecta"
-
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "No un archivo csv válido"
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr "Nombre de usuario o contraseña es incorrecta"
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
@@ -3157,7 +3542,25 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #: bookwyrm/views/rss_feed.py:34
 #, python-brace-format
 msgid "Status updates from {obj.display_name}"
-msgstr ""
+msgstr "Actualizaciones de status de {obj.display_name}"
+
+#~ msgid "This instance is closed"
+#~ msgstr "Esta instancia está cerrada."
+
+#~ msgid "Contact an administrator to get an invite"
+#~ msgstr "Contactar a unx administradorx para recibir una invitación"
+
+#~ msgid "Spoiler alert:"
+#~ msgstr "Alerta de spoiler:"
+
+#~ msgid "Date federated"
+#~ msgstr "Fecha de federalización"
+
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Resultados de búsqueda por \"%(query)s\""
+
+#~ msgid "Matching Books"
+#~ msgstr "Libros correspondientes"
 
 #~ msgid "Local Timeline"
 #~ msgstr "Línea temporal local"
@@ -3165,9 +3568,6 @@ msgstr ""
 #~ msgid "Federated Timeline"
 #~ msgstr "Línea temporal federalizado"
 
-#~ msgid "Local"
-#~ msgstr "Local"
-
 #~ msgid "Federated Servers"
 #~ msgstr "Servidores federalizados"
 
@@ -3291,9 +3691,6 @@ msgstr ""
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "El valor %(value)s no es una opción válida."
 
-#~ msgid "This field cannot be null."
-#~ msgstr "Este campo no puede ser nulo."
-
 #~ msgid "This field cannot be blank."
 #~ msgstr "Este campo no puede ser vacio."
 
@@ -3350,9 +3747,6 @@ msgstr ""
 #~ msgid "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
 #~ msgstr "“%(value)s” valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
 
-#~ msgid "Duration"
-#~ msgstr "Duración"
-
 #~ msgid "Email address"
 #~ msgstr "Dirección de correo electrónico"
 
@@ -3368,18 +3762,12 @@ msgstr ""
 #~ msgid "“%(value)s” value must be an integer."
 #~ msgstr "“%(value)s” valor debe ser un entero."
 
-#~ msgid "Integer"
-#~ msgstr "Entero"
-
 #~ msgid "Big (8 byte) integer"
 #~ msgstr "Entero grande (8 byte)"
 
 #~ msgid "IPv4 address"
 #~ msgstr "Dirección IPv4"
 
-#~ msgid "IP address"
-#~ msgstr "Dirección IP"
-
 #~ msgid "“%(value)s” value must be either None, True or False."
 #~ msgstr "Valor “%(value)s” debe ser o None, True, o False."
 
@@ -4071,9 +4459,6 @@ msgstr ""
 #~ msgid "Books tagged \"%(tag.name)s\""
 #~ msgstr "Libros etiquetados con \"%(tag.name)s\""
 
-#~ msgid "Deactivate user"
-#~ msgstr "Desactivar usuario"
-
 #~ msgid "Reactivate user"
 #~ msgstr "Reactivar usuario"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 75ac69ebf..641b48438 100644
Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 46416931e..6a3e7d32f 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/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-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,62 +18,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 msgid "A user with this email already exists."
 msgstr "Cet email est déjà associé à un compte."
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr "Un jour"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr "Une semaine"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr "Un mois"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr "Sans expiration"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 msgid "Unlimited"
 msgstr "Sans limite"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
 msgstr "Ordre de la liste"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 msgid "Ascending"
 msgstr "Ordre croissant"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 msgid "Descending"
 msgstr "Ordre décroissant"
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr ""
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:13
+#, fuzzy
+#| msgid "Ascending"
+msgid "Pending"
+msgstr "Ordre croissant"
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:15
+#, fuzzy
+#| msgid "Moderator Comments"
+msgid "Moderator suspension"
+msgstr "Commentaires de l’équipe de modération"
+
+#: bookwyrm/models/base_model.py:16
+#, fuzzy
+#| msgid "List curation:"
+msgid "Moderator deletion"
+msgstr "Modération de la liste :"
+
+#: bookwyrm/models/base_model.py:17
+#, fuzzy
+#| msgid "Un-block"
+msgid "Domain block"
+msgstr "Débloquer"
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr "Fédéré"
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+msgid "Blocked"
+msgstr "Bloqué"
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -84,55 +133,55 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr "nom du compte :"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 #, fuzzy
 #| msgid "Book Title"
 msgid "Books Timeline"
 msgstr "Titre du livre"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "Livres"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr "简化字"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 #, fuzzy
 #| msgid "Additional info:"
 msgid "Traditional Chinese"
@@ -181,12 +230,12 @@ msgid "Wikipedia"
 msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "Voir sur Inventaire"
 
@@ -223,7 +272,7 @@ msgid "Last edited by:"
 msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "Métadonnées"
 
@@ -235,9 +284,9 @@ msgid "Name:"
 msgstr "Nom :"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "Séparez plusieurs valeurs par une virgule."
 
@@ -266,7 +315,7 @@ msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Identifiant Inventaire :"
 
@@ -279,127 +328,129 @@ msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr "Enregistrer"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "par"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "Critiques"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "Vos critiques"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "Vos commentaires"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "Vos citations"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -407,13 +458,15 @@ msgstr "Lieux"
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr "Ajouter"
 
@@ -422,22 +475,22 @@ msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -452,133 +505,133 @@ msgstr "Modifier « %(book_title)s »"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "Confirmer les informations de ce livre"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Auteur/autrice de <em>%(book_title)s</em>"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "Création d’un nouvel auteur/autrice : %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "Est‑ce l’édition d’un ouvrage existant ?"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "Il s’agit d’un nouvel ouvrage."
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Retour"
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "Langues :"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "Retirer %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "Page de %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Identifiant Openlibrary :"
 
@@ -644,33 +697,40 @@ msgstr "l’a noté"
 msgid "Progress Updates:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "Montrer toutes les progressions"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "Résultats de recherche"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -679,6 +739,10 @@ msgstr "Supprimer ces dates de lecture"
 msgid "Close"
 msgstr "Fermer"
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr ""
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
 msgstr "Rédiger un statut"
@@ -700,12 +764,14 @@ msgid "Sorry! We couldn't find that code."
 msgstr "Pardon ! Nous ne reconnaissons pas ce code."
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 msgid "Confirmation code:"
 msgstr "Code de confirmation :"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr "Valider"
 
@@ -718,7 +784,7 @@ msgid "Resend confirmation link"
 msgstr "Envoyer le lien de confirmation de nouveau"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -743,7 +809,7 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
 msgstr "Répertoire"
 
@@ -817,7 +883,7 @@ msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 #, fuzzy
 #| msgid "Discard"
 msgid "Discover"
@@ -947,7 +1013,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -983,18 +1049,19 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "Lectures en cours"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "Lu"
 
@@ -1004,11 +1071,23 @@ msgstr "Lu"
 msgid "%(year)s Reading Goal"
 msgstr "Défi lecture pour %(year)s"
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "À qui s’abonner"
 
+#: bookwyrm/templates/feed/suggested_users.html:9
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Don't show suggested users"
+msgstr "Afficher ce compte dans ceux suggérés :"
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "Répertoire"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1019,12 +1098,11 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Aucun livre trouvé pour « %(query)s »"
@@ -1038,7 +1116,7 @@ msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(s
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1065,7 +1143,7 @@ msgid "Save &amp; continue"
 msgstr "Enregistrer &amp; continuer"
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr "Bienvenue"
 
@@ -1119,12 +1197,12 @@ msgid "Avatar:"
 msgstr "Avatar :"
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr "Autoriser les abonnements manuellement :"
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
 msgstr "Afficher ce compte dans ceux suggérés :"
 
@@ -1171,125 +1249,130 @@ msgstr "Vos livres en %(year)s"
 msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "Importer des livres"
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 msgid "Data source:"
 msgstr "Source de données :"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr "Fichier de données :"
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr "Importer les critiques"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importer"
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr "Aucune importation récente"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr "Statut de l’importation"
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to imports"
 msgstr "Retour aux signalements"
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr "Début de l’importation :"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr "Fin de l’importation :"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr "la tâche a échoué"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr "L’importation est toujours en cours"
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr "(Rechargez la page pour la mettre à jour !)"
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr "Éléments non importés"
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr "Ligne %(index)s : <strong>%(title)s</strong> par %(author)s"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr "Réessayer l’importation de ces éléments"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 #, fuzzy
 #| msgid "Import still in progress."
 msgid "Import Progress"
 msgstr "L’importation est toujours en cours"
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "Auteur/autrice"
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr "Importé"
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr ""
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr "Créer un compte"
 
@@ -1301,19 +1384,6 @@ msgstr "Autorisation refusée"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "Résultats de recherche"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Résultats de recherche pour « %(query)s »"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "Livres correspondants"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1333,126 +1403,145 @@ msgstr "Politique de vie privée"
 msgid "Recent Books"
 msgstr "Livres récents"
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr "Décentralisé"
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr "Sympa"
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr "Anti‑commercial"
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr "Rejoignez %(name)s"
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "Cette instance est fermée"
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "Merci ! Votre demande a bien été reçue."
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
 msgstr "Demander une invitation"
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, fuzzy, python-format
+#| msgid "(Recommended if registration is open)"
+msgid "%(name)s registration is closed"
+msgstr "(Recommandé si les inscriptions sont ouvertes)"
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr "Merci ! Votre demande a bien été reçue."
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a book, user, or list"
 msgstr "Chercher un livre ou un compte"
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Your Books"
 msgstr "Vos Livres"
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully posted status"
+msgstr "Importation réussie"
+
+#: bookwyrm/templates/layout.html:220
+#, fuzzy
+#| msgid "Boost status"
+msgid "Error posting status"
+msgstr "Partager le statut"
+
+#: bookwyrm/templates/layout.html:228
 msgid "About this instance"
 msgstr "À propos de cette instance"
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 msgid "Documentation"
 msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1492,8 +1581,29 @@ msgstr "Approuver"
 msgid "Discard"
 msgstr "Rejeter"
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+#, fuzzy
+#| msgid "Delete this progress update"
+msgid "Delete this list?"
+msgstr "Supprimer cette mise à jour"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This action cannot be un-done"
+msgstr "Cette étagère est vide"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Supprimer"
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -1528,6 +1638,12 @@ msgstr "Ouverte"
 msgid "Anyone can add books to this list"
 msgstr "N’importe qui peut suggérer des livres"
 
+#: bookwyrm/templates/lists/form.html:49
+#, fuzzy
+#| msgid "Delete status"
+msgid "Delete list"
+msgstr "Supprimer le statut"
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr "Vous avez suggéré un livre à cette liste !"
@@ -1592,28 +1708,42 @@ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 msgid "Suggest"
 msgstr "Suggérer"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "Enregistrer"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "Vos listes"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "Listes"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "Créer une liste"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
 msgstr "Bravo ! L’adresse email a été confirmée."
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr "Contacter un administrateur pour obtenir une invitation"
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
@@ -1687,7 +1817,7 @@ msgstr "Signalements : %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 msgid "Reports"
 msgstr "Signalements"
 
@@ -1867,6 +1997,7 @@ msgstr "Nouveau mot de passe :"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 #, fuzzy
 #| msgid "Create an Account"
 msgid "Delete Account"
@@ -1886,21 +2017,29 @@ msgid "Edit Profile"
 msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
+#, fuzzy
+#| msgid "Show set reading goal prompt in feed:"
+msgid "Show reading goal prompt in feed:"
 msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
+#: bookwyrm/templates/preferences/edit_user.html:50
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Show suggested users:"
+msgstr "Afficher ce compte dans ceux suggérés :"
+
 #: bookwyrm/templates/preferences/edit_user.html:58
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+
+#: bookwyrm/templates/preferences/edit_user.html:68
 #, fuzzy
 #| msgid "Post privacy"
 msgid "Default post privacy:"
 msgstr "Confidentialité du statut"
 
-#: bookwyrm/templates/preferences/edit_user.html:70
-#, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
-
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
 msgstr "Fuseau horaire préféré"
 
@@ -1909,6 +2048,7 @@ msgid "Account"
 msgstr "Compte"
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr "Profil"
 
@@ -1956,7 +2096,9 @@ msgstr "Type de recherche"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1967,56 +2109,6 @@ msgstr "Comptes"
 msgid "No results found for \"%(query)s\""
 msgstr "Aucun résultat pour « %(query)s »"
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr "Administration"
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr "Gérer les comptes"
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Instances"
-msgstr "Instances fédérées"
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr "Paramètres de l’instance"
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr "Annonces"
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr "Paramètres du site"
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr "Information sur l’instance"
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr "Images"
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr "Contenu du pied de page"
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr "Inscription"
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
@@ -2032,12 +2124,6 @@ msgstr "Retour à la liste"
 msgid "Edit Announcement"
 msgstr "Modifier l’annonce"
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Supprimer"
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
 msgstr "Visible :"
@@ -2051,14 +2137,19 @@ msgid "False"
 msgstr "Faux"
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 msgid "Start date:"
 msgstr "Date de début :"
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 msgid "End date:"
 msgstr "Date de fin :"
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 msgid "Active:"
 msgstr "Active :"
 
@@ -2067,7 +2158,32 @@ msgstr "Active :"
 msgid "Create Announcement"
 msgstr "Ajouter une annonce"
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+#, fuzzy
+#| msgid "Preview"
+msgid "Preview:"
+msgstr "Aperçu"
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+#, fuzzy
+#| msgid "Content"
+msgid "Content:"
+msgstr "Contenu"
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+#, fuzzy
+#| msgid "End date:"
+msgid "Event date:"
+msgstr "Date de fin :"
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr "Annonces"
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 msgid "Date added"
 msgstr "Date d’ajout"
 
@@ -2084,10 +2200,11 @@ msgid "End date"
 msgstr "Date de fin"
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr "Statut"
 
@@ -2099,6 +2216,106 @@ msgstr "active"
 msgid "inactive"
 msgstr "inactive"
 
+#: bookwyrm/templates/settings/announcements.html:54
+#, fuzzy
+#| msgid "Announcements"
+msgid "No announcements found."
+msgstr "Annonces"
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:15
+#, fuzzy
+#| msgid "Local users"
+msgid "Total users"
+msgstr "Comptes locaux"
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:27
+#, fuzzy
+#| msgid "Status"
+msgid "Statuses"
+msgstr "Statut"
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] "%(count)d utilisations"
+msgstr[1] "%(count)d utilisations"
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] "%(count)d utilisations"
+msgstr[1] "%(count)d utilisations"
+
+#: bookwyrm/templates/settings/dashboard.html:65
+#, fuzzy
+#| msgid "User Activity"
+msgid "Instance Activity"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:87
+#, fuzzy
+#| msgid "One Week"
+msgid "Weeks"
+msgstr "Une semaine"
+
+#: bookwyrm/templates/settings/dashboard.html:100
+#, fuzzy
+#| msgid "User Activity"
+msgid "User signup activity"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/settings/dashboard.html:106
+#, fuzzy
+#| msgid "User Activity"
+msgid "Status activity"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+#, fuzzy
+#| msgid "No statuses reported"
+msgid "Statuses posted"
+msgstr "Aucun statut signalé"
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2125,28 +2342,19 @@ msgstr "Instance :"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 msgid "Status:"
 msgstr "Statut :"
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "Fédéré"
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-msgid "Blocked"
-msgstr "Bloqué"
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 msgid "Version:"
 msgstr "Description :"
 
@@ -2154,6 +2362,37 @@ msgstr "Description :"
 msgid "Notes:"
 msgstr "Remarques :"
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "Email Blocklist"
+msgstr "Importer une liste de blocage"
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Options"
+msgstr "Actions"
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] "%(count)d utilisations"
+msgstr[1] "%(count)d utilisations"
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "Détails"
@@ -2173,6 +2412,7 @@ msgid "View all"
 msgstr "Voir tous"
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 msgid "Reports:"
 msgstr "Signalements :"
 
@@ -2189,7 +2429,7 @@ msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr "Remarques"
 
@@ -2220,19 +2460,104 @@ msgstr "Débloquer"
 msgid "All users from this instance will be re-activated."
 msgstr "Tous les comptes de cette instance seront réactivés."
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+msgid "Federated Instances"
+msgstr "Instances fédérées"
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Instance name"
 msgstr "Nom de l’instance"
 
-#: bookwyrm/templates/settings/federation.html:23
-msgid "Date federated"
-msgstr "Date de fédération"
-
-#: bookwyrm/templates/settings/federation.html:27
+#: bookwyrm/templates/settings/federation.html:40
 msgid "Software"
 msgstr "Logiciel"
 
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+#, fuzzy
+#| msgid "Email address:"
+msgid "Add IP address"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP Address:"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "IP Address Blocklist"
+msgstr "Importer une liste de blocage"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+#, fuzzy
+#| msgid "Email address:"
+msgid "Address"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr "Administration"
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr "Gérer les comptes"
+
+#: bookwyrm/templates/settings/layout.html:51
+#, fuzzy
+#| msgid "List curation:"
+msgid "Moderation"
+msgstr "Modération de la liste :"
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr "Paramètres de l’instance"
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "Paramètres du site"
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "Information sur l’instance"
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr "Images"
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr "Contenu du pied de page"
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
+msgstr "Inscription"
+
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2369,61 +2694,77 @@ msgid "Instance description:"
 msgstr "Description de l’instance :"
 
 #: bookwyrm/templates/settings/site.html:27
+#, fuzzy
+#| msgid "Description:"
+msgid "Short description:"
+msgstr "Description :"
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr "Code de conduite :"
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr "Politique de vie privée :"
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr "Logo :"
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr "Logo réduit :"
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr "Favicon :"
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr "URL pour soutenir l’instance :"
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr "Titre pour soutenir l’instance :"
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr "Email de l’administrateur :"
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
 msgstr "Infos supplémentaires :"
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 msgid "Allow registration"
 msgstr "Autoriser les inscriptions"
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 msgid "Allow invite requests"
 msgstr "Autoriser les demandes d’invitation"
 
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:102
 msgid "Require users to confirm email address"
 msgstr "Demander aux utilisateurs et utilisatrices de confirmer leur adresse email"
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:104
 msgid "(Recommended if registration is open)"
 msgstr "(Recommandé si les inscriptions sont ouvertes)"
 
-#: bookwyrm/templates/settings/site.html:102
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les inscriptions sont closes :"
 
+#: bookwyrm/templates/settings/site.html:111
+#, fuzzy
+#| msgid "Invite Requests"
+msgid "Invite request text:"
+msgstr "Demandes d’invitation"
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2436,7 +2777,7 @@ msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "Pas de couverture"
 
@@ -2473,48 +2814,50 @@ msgstr ""
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
 msgstr "Contenu"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "Alerte Spoiler :"
-
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning:"
+msgstr "Contenu"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr "Attention spoilers !"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "Commentaire :"
@@ -2526,27 +2869,45 @@ msgstr "Commentaire :"
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr "Publier"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "Citation :"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Edit \"%(book_title)s\""
 msgid "An excerpt from '%(book_title)s'"
 msgstr "Modifier « %(book_title)s »"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "Description :"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "pages"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "pourcent"
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "Éditions de %(book_title)s"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
 msgstr "Critique :"
 
@@ -2559,13 +2920,13 @@ msgstr "Supprimer ces dates de lecture ?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "Ajouter aux favoris"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "Retirer des favoris"
 
@@ -2613,12 +2974,21 @@ msgstr "Se désabonner"
 msgid "Accept"
 msgstr "Accepter"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, fuzzy, python-format
+#| msgid "%(rating)s star"
+#| msgid_plural "%(rating)s stars"
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] "%(rating)s étoile"
+msgstr[1] "%(rating)s étoiles"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2768,7 +3138,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2806,37 +3176,59 @@ msgstr "Déplacer le livre"
 msgid "More shelves"
 msgstr "Plus d’étagères"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr "Terminer la lecture"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr "Je veux le lire"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr "Terminer la lecture"
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
-msgstr "Déplier"
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning"
+msgstr "Contenu"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
-msgstr "Replier"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+#, fuzzy
+#| msgid "Like status"
+msgid "Show status"
+msgstr "Ajouter le statut aux favoris"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "page %(page)s"
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "%(percent)s%% terminé !"
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+#, fuzzy
+#| msgid "Like status"
+msgid "Hide status"
+msgstr "Ajouter le statut aux favoris"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
@@ -2914,7 +3306,7 @@ msgstr "Supprimer & recommencer la rédaction"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr "Envoyer un message direct"
 
@@ -2951,6 +3343,14 @@ msgstr "Trié par ordre croissant"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr "Déplier"
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr "Replier"
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Profil"
@@ -3005,38 +3405,50 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Tous les livres"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -3096,7 +3508,23 @@ msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez"
 msgid "No followers you follow"
 msgstr "compte que vous suivez"
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+msgid "Permanently delete user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Your password:"
+msgstr "Confirmez le mot de passe :"
+
+#: bookwyrm/templates/user_admin/user.html:8
 msgid "Back to users"
 msgstr "Retour aux comptes"
 
@@ -3123,31 +3551,85 @@ msgid "Remote instance"
 msgstr "Instance distante"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 msgid "Active"
 msgstr "Actif"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
 msgstr "Inactif"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
 msgstr "Non défini"
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr "Détails du compte"
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 msgid "View user profile"
 msgstr "Voir le profil"
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr "Local"
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote"
+msgstr "Retirer"
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr "Détails du compte"
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+#, fuzzy
+#| msgid "Email"
+msgid "Email:"
+msgstr "Email"
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+#, fuzzy
+#| msgid "Directory"
+msgid "(View reports)"
+msgstr "Répertoire"
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+#, fuzzy
+#| msgid "Blocked by us:"
+msgid "Blocked by count:"
+msgstr "Bloqués par nous :"
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+#, fuzzy
+#| msgid "last active"
+msgid "Last active date:"
+msgstr "dernière activité"
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+#, fuzzy
+#| msgid "Manually approve followers:"
+msgid "Manually approved followers:"
+msgstr "Autoriser les abonnements manuellement :"
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+#, fuzzy
+#| msgid "Discard"
+msgid "Discoverable:"
+msgstr "Rejeter"
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+#, fuzzy
+#| msgid "Deactivate user"
+msgid "Deactivation reason:"
+msgstr "Désactiver le compte"
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 msgid "Instance details"
 msgstr "Détails de l’instance"
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr "Voir l’instance"
 
@@ -3155,35 +3637,35 @@ msgstr "Voir l’instance"
 msgid "Permanently deleted"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr "Suspendre le compte"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr "Rétablir le compte"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s (%(subtitle)s)"
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr ""
-
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "Fichier CSV non valide"
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "Aucun compte avec cette adresse email n’a été trouvé."
@@ -3198,15 +3680,30 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "This instance is closed"
+#~ msgstr "Cette instance est fermée"
+
+#~ msgid "Contact an administrator to get an invite"
+#~ msgstr "Contacter un administrateur pour obtenir une invitation"
+
+#~ msgid "Spoiler alert:"
+#~ msgstr "Alerte Spoiler :"
+
+#~ msgid "Date federated"
+#~ msgstr "Date de fédération"
+
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "Résultats de recherche pour « %(query)s »"
+
+#~ msgid "Matching Books"
+#~ msgstr "Livres correspondants"
+
 #~ msgid "Local Timeline"
 #~ msgstr "Fil d’actualité local"
 
 #~ msgid "Federated Timeline"
 #~ msgstr "Fil d’actualité des instances fédérées"
 
-#~ msgid "Local"
-#~ msgstr "Local"
-
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
@@ -3262,11 +3759,6 @@ msgstr ""
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s n’est pas une remote_id valide."
 
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field cannot be null."
-#~ msgstr "Cette étagère est vide"
-
 #, fuzzy
 #~| msgid "A user with this email already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
@@ -3282,11 +3774,6 @@ msgstr ""
 #~ msgid "Decimal number"
 #~ msgstr "Numéro dans la série :"
 
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Modération de la liste :"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Email address"
@@ -3302,11 +3789,6 @@ msgstr ""
 #~ msgid "IPv4 address"
 #~ msgstr "Adresse email :"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "Adresse email :"
-
 #, fuzzy
 #~| msgid "No active invites"
 #~ msgid "Positive integer"
@@ -3486,9 +3968,6 @@ msgstr ""
 #~ msgid "by %(author)s"
 #~ msgstr "par %(author)s"
 
-#~ msgid "Deactivate user"
-#~ msgstr "Désactiver le compte"
-
 #~ msgid "Reactivate user"
 #~ msgstr "Réactiver le compte"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 673939927..5501c309a 100644
Binary files a/locale/zh_Hans/LC_MESSAGES/django.mo and b/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 75def3735..93e5b1aff 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/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-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,62 +18,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 msgid "A user with this email already exists."
 msgstr "已经存在使用该邮箱的用户。"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
 msgstr "列表顺序"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 msgid "Book Title"
 msgstr "书名"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 msgid "Descending"
 msgstr "降序"
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr ""
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:13
+#, fuzzy
+#| msgid "Ascending"
+msgid "Pending"
+msgstr "升序"
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:15
+#, fuzzy
+#| msgid "Moderator Comments"
+msgid "Moderator suspension"
+msgstr "监察员评论"
+
+#: bookwyrm/models/base_model.py:16
+#, fuzzy
+#| msgid "Mentions"
+msgid "Moderator deletion"
+msgstr "提及"
+
+#: bookwyrm/models/base_model.py:17
+#, fuzzy
+#| msgid "Un-block"
+msgid "Domain block"
+msgstr "取消屏蔽"
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr "跨站"
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+msgid "Blocked"
+msgstr "已屏蔽"
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -84,53 +133,53 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的用户名"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr "用户名"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr "主页时间线"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 msgid "Books Timeline"
 msgstr "书目时间线"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "书目"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 msgid "Traditional Chinese"
 msgstr "繁體中文（繁体中文）"
 
@@ -177,12 +226,12 @@ msgid "Wikipedia"
 msgstr "维基百科"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "在 Inventaire 查看"
 
@@ -219,7 +268,7 @@ msgid "Last edited by:"
 msgstr "最后编辑人:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "元数据"
 
@@ -231,9 +280,9 @@ msgid "Name:"
 msgstr "名称:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "请用英文逗号(,)分隔多个值。"
 
@@ -262,7 +311,7 @@ msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Inventaire ID:"
 
@@ -275,126 +324,128 @@ msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr "保存"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr "取消"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加封面"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "加载封面失败"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "添加描述"
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本书的 <a href=\"%(book_path)s\">另一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "书评"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "你的书评"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "你的评论"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "你的引用"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -402,13 +453,15 @@ msgstr "地点"
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr "添加"
 
@@ -417,22 +470,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC 号:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "上传封面:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "从网址加载封面:"
 
@@ -447,133 +500,133 @@ msgstr "编辑《%(book_title)s》"
 msgid "Add Book"
 msgstr "添加书目"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "确认书目信息"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "“%(name)s” 是已存在的作者吗？"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "<em>%(book_title)s</em> 的作者"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "这是一位新的作者"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "正在创建新的作者: %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "这是已存在的作品的一个版本吗？"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "这是一个新的作品。"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "确认"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "标题:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "副标题:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "系列编号:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "语言:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "初版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, python-format
 msgid "Remove %(name)s"
 msgstr "移除 %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, python-format
 msgid "Author page for %(name)s"
 msgstr "%(name)s 的作者页面"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "张三, 李四"
 
-#: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "封面"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格式:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "书目标识号"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Openlibrary ID:"
 
@@ -639,33 +692,40 @@ msgstr "评价了"
 msgid "Progress Updates:"
 msgstr "进度更新:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "已完成"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "显示所有更新"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "搜索结果"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -674,6 +734,10 @@ msgstr "删除这些阅读日期"
 msgid "Close"
 msgstr "关闭"
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr ""
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
 msgstr "撰写状态"
@@ -695,12 +759,14 @@ msgid "Sorry! We couldn't find that code."
 msgstr "抱歉！我们无法找到该代码。"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 msgid "Confirmation code:"
 msgstr "确认代码:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr "提交"
 
@@ -713,7 +779,7 @@ msgid "Resend confirmation link"
 msgstr "重新发送确认链接"
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -738,7 +804,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
 msgstr "目录"
 
@@ -808,7 +874,7 @@ msgstr "所有已知用户"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 msgid "Discover"
 msgstr "发现"
 
@@ -934,7 +1000,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> 私信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr "私信"
 
@@ -969,18 +1035,19 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "读过"
 
@@ -990,11 +1057,23 @@ msgstr "读过"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s 阅读目标"
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "可以关注的人"
 
+#: bookwyrm/templates/feed/suggested_users.html:9
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Don't show suggested users"
+msgstr "在推荐的用户中显示此帐号:"
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "目录"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1005,12 +1084,11 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "搜索书目"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的书目"
@@ -1024,7 +1102,7 @@ msgstr "你可以在开始使用 %(site_name)s 后添加书目。"
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1051,7 +1129,7 @@ msgid "Save &amp; continue"
 msgstr "保存 &amp; 继续"
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr "欢迎"
 
@@ -1105,12 +1183,12 @@ msgid "Avatar:"
 msgstr "头像:"
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr "手动批准关注者:"
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
 msgstr "在推荐的用户中显示此帐号:"
 
@@ -1157,121 +1235,126 @@ msgstr "你 %(year)s 的书目"
 msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "导入书目"
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 msgid "Data source:"
 msgstr "数据来源:"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr "数据文件:"
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr "纳入书评"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr "导入书评的隐私设定"
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "导入"
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr "最近的导入"
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr "无最近的导入"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr "导入状态"
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 msgid "Back to imports"
 msgstr "回到导入"
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr "导入开始:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr "导入完成:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr "任务失败"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr "还在导入中。"
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr "（按下重新加载来更新！）"
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr "加载失败"
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "跳转至列表底部来选取 %(failed_count)s 个导入失败的项目。"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr "第 %(index)s 行: %(author)s 所著的 <strong>%(title)s</strong>"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr "全选"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr "重试项目"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr "成功导入了"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 msgid "Import Progress"
 msgstr "导入进度"
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr "书目"
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "标题"
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "作者"
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr "已导入"
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr ""
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr "创建帐号"
 
@@ -1283,19 +1366,6 @@ msgstr "没有权限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀请码已不再有效。"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "搜索结果"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "\"%(query)s\" 的搜索结果"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "匹配的书目"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1315,126 +1385,145 @@ msgstr "隐私政策"
 msgid "Recent Books"
 msgstr "最近书目"
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr "去中心化"
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr "友好"
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr "反企业"
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "本实例不开放。"
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "谢谢你！我们已经收到了你的请求。"
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
 msgstr "请求邀请"
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, fuzzy, python-format
+#| msgid "(Recommended if registration is open)"
+msgid "%(name)s registration is closed"
+msgstr "（当开放注册时推荐）"
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr "谢谢你！我们已经收到了你的请求。"
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr "你的帐号"
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a book, user, or list"
 msgstr "搜索书目或用户"
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr "主导航菜单"
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr "动态"
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Your Books"
 msgstr "你的书目"
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr "管理员"
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户名:"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr "密码"
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr "忘记了密码？"
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully posted status"
+msgstr "成功导入了"
+
+#: bookwyrm/templates/layout.html:220
+#, fuzzy
+#| msgid "Boost status"
+msgid "Error posting status"
+msgstr "转发状态"
+
+#: bookwyrm/templates/layout.html:228
 msgid "About this instance"
 msgstr "关于本实例"
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr "联系站点管理员"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 msgid "Documentation"
 msgstr "文档"
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支持 %(site_name)s"
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开源软件。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1474,8 +1563,27 @@ msgstr "批准"
 msgid "Discard"
 msgstr "削除"
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+#, fuzzy
+#| msgid "Delete this progress update"
+msgid "Delete this list?"
+msgstr "删除此进度更新"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+msgid "This action cannot be un-done"
+msgstr ""
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "删除"
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr "编辑列表"
 
@@ -1510,6 +1618,12 @@ msgstr "开放"
 msgid "Anyone can add books to this list"
 msgstr "任何人都可以向此列表中添加书目"
 
+#: bookwyrm/templates/lists/form.html:49
+#, fuzzy
+#| msgid "Delete status"
+msgid "Delete list"
+msgstr "删除发文"
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr "你成功向该列表推荐了一本书！"
@@ -1574,28 +1688,42 @@ msgstr "没有符合 “%(query)s” 请求的书目"
 msgid "Suggest"
 msgstr "推荐"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "保存"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "你的列表"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "创建列表"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登录"
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
 msgstr "成功！邮箱地址已确认。"
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "密码:"
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr "联系管理员以取得邀请"
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr "更多关于本站点的信息"
 
@@ -1669,7 +1797,7 @@ msgstr "报告: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 msgid "Reports"
 msgstr "报告"
 
@@ -1850,6 +1978,7 @@ msgstr "新密码:"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 msgid "Delete Account"
 msgstr "删除帐号"
 
@@ -1867,19 +1996,27 @@ msgid "Edit Profile"
 msgstr "编辑个人资料"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
+#, fuzzy
+#| msgid "Show set reading goal prompt in feed:"
+msgid "Show reading goal prompt in feed:"
 msgstr "在消息流中显示设置阅读目标的提示:"
 
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Default post privacy:"
-msgstr "默认发文隐私:"
+#: bookwyrm/templates/preferences/edit_user.html:50
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Show suggested users:"
+msgstr "在推荐的用户中显示此帐号:"
 
-#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/preferences/edit_user.html:58
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr "你的帐号会显示在 <a href=\"%(path)s\">目录</a> 中，并可能受其它 BookWyrm 用户推荐。"
 
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:68
+msgid "Default post privacy:"
+msgstr "默认发文隐私:"
+
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
 msgstr "偏好的时区:"
 
@@ -1888,6 +2025,7 @@ msgid "Account"
 msgstr "帐号"
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr "个人资料"
 
@@ -1932,7 +2070,9 @@ msgstr "搜索类型"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1943,56 +2083,6 @@ msgstr "用户"
 msgid "No results found for \"%(query)s\""
 msgstr "没有找到 “%(query)s” 的搜索结果"
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr "管理"
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr "管理用户"
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Instances"
-msgstr "互联实例"
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr "实例设置"
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr "公告"
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr "站点设置"
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr "实例信息"
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr "图像"
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr "页脚内容"
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr "注册"
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
@@ -2008,12 +2098,6 @@ msgstr "回到列表"
 msgid "Edit Announcement"
 msgstr "编辑公告"
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "删除"
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
 msgstr "可见:"
@@ -2027,14 +2111,19 @@ msgid "False"
 msgstr "否"
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 msgid "Start date:"
 msgstr "开始日期:"
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 msgid "End date:"
 msgstr "结束日期:"
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 msgid "Active:"
 msgstr "活跃:"
 
@@ -2043,7 +2132,32 @@ msgstr "活跃:"
 msgid "Create Announcement"
 msgstr "创建公告"
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+#, fuzzy
+#| msgid "Preview"
+msgid "Preview:"
+msgstr "预览"
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+#, fuzzy
+#| msgid "Content"
+msgid "Content:"
+msgstr "内容"
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+#, fuzzy
+#| msgid "End date:"
+msgid "Event date:"
+msgstr "结束日期:"
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr "公告"
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 msgid "Date added"
 msgstr "添加日期:"
 
@@ -2060,10 +2174,11 @@ msgid "End date"
 msgstr "结束日期"
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr "状态"
 
@@ -2075,6 +2190,104 @@ msgstr "活跃"
 msgid "inactive"
 msgstr "停用"
 
+#: bookwyrm/templates/settings/announcements.html:54
+#, fuzzy
+#| msgid "Announcements"
+msgid "No announcements found."
+msgstr "公告"
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:15
+#, fuzzy
+#| msgid "Local users"
+msgid "Total users"
+msgstr "本地用户"
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:27
+#, fuzzy
+#| msgid "Status"
+msgid "Statuses"
+msgstr "状态"
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] "%(count)d 次使用"
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] "%(count)d 次使用"
+
+#: bookwyrm/templates/settings/dashboard.html:65
+#, fuzzy
+#| msgid "User Activity"
+msgid "Instance Activity"
+msgstr "用户活动"
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:87
+#, fuzzy
+#| msgid "One Week"
+msgid "Weeks"
+msgstr "一周"
+
+#: bookwyrm/templates/settings/dashboard.html:100
+#, fuzzy
+#| msgid "User Activity"
+msgid "User signup activity"
+msgstr "用户活动"
+
+#: bookwyrm/templates/settings/dashboard.html:106
+#, fuzzy
+#| msgid "User Activity"
+msgid "Status activity"
+msgstr "用户活动"
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+#, fuzzy
+#| msgid "No statuses reported"
+msgid "Statuses posted"
+msgstr "没有被报告的状态"
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2101,28 +2314,19 @@ msgstr "实例:"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 msgid "Status:"
 msgstr "状态:"
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "跨站"
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-msgid "Blocked"
-msgstr "已屏蔽"
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr "软件:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 msgid "Version:"
 msgstr "版本:"
 
@@ -2130,6 +2334,36 @@ msgstr "版本:"
 msgid "Notes:"
 msgstr "备注:"
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "Email Blocklist"
+msgstr "导入屏蔽列表"
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Options"
+msgstr "动作"
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] "%(count)d 次使用"
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "详细"
@@ -2149,6 +2383,7 @@ msgid "View all"
 msgstr "查看全部"
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 msgid "Reports:"
 msgstr "报告:"
 
@@ -2165,7 +2400,7 @@ msgid "Blocked by us:"
 msgstr "我们所屏蔽的:"
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr "备注"
 
@@ -2196,19 +2431,102 @@ msgstr "取消屏蔽"
 msgid "All users from this instance will be re-activated."
 msgstr "来自此实例的所有用户将会被重新启用。"
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+msgid "Federated Instances"
+msgstr "互联实例"
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Instance name"
 msgstr "实例名称"
 
-#: bookwyrm/templates/settings/federation.html:23
-msgid "Date federated"
-msgstr "跨站日期"
-
-#: bookwyrm/templates/settings/federation.html:27
+#: bookwyrm/templates/settings/federation.html:40
 msgid "Software"
 msgstr "软件"
 
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+#, fuzzy
+#| msgid "Add read dates"
+msgid "Add IP address"
+msgstr "添加阅读日期"
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP Address:"
+msgstr "邮箱地址:"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "IP Address Blocklist"
+msgstr "导入屏蔽列表"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+msgid "Address"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr "管理"
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr "管理用户"
+
+#: bookwyrm/templates/settings/layout.html:51
+#, fuzzy
+#| msgid "Mentions"
+msgid "Moderation"
+msgstr "提及"
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr "实例设置"
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "站点设置"
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "实例信息"
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr "图像"
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr "页脚内容"
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
+msgstr "注册"
+
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2345,61 +2663,77 @@ msgid "Instance description:"
 msgstr "实例描述:"
 
 #: bookwyrm/templates/settings/site.html:27
+#, fuzzy
+#| msgid "Description:"
+msgid "Short description:"
+msgstr "描述:"
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr "行为准则:"
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr "隐私政策:"
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr "图标:"
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr "小号图标:"
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr "Favicon:"
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr "支持链接:"
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr "支持标题:"
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr "管理员邮件:"
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
 msgstr "附加信息:"
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 msgid "Allow registration"
 msgstr "允许注册"
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 msgid "Allow invite requests"
 msgstr "允许请求邀请"
 
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:102
 msgid "Require users to confirm email address"
 msgstr "要求用户确认邮箱地址"
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:104
 msgid "(Recommended if registration is open)"
 msgstr "（当开放注册时推荐）"
 
-#: bookwyrm/templates/settings/site.html:102
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
+#: bookwyrm/templates/settings/site.html:111
+#, fuzzy
+#| msgid "Invite Requests"
+msgid "Invite request text:"
+msgstr "邀请请求"
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2411,7 +2745,7 @@ msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] "与其它 %(remainder_count_display)s 位"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "没有封面"
 
@@ -2447,48 +2781,50 @@ msgstr "对书的一些看法"
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr "回复"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
 msgstr "内容"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "剧透警告:"
-
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning:"
+msgstr "内容"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr "前有剧透！"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr "加入剧透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "评论:"
@@ -2500,25 +2836,43 @@ msgstr "评论:"
 msgid "Private"
 msgstr "私密"
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr "发布"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, python-format
 msgid "An excerpt from '%(book_title)s'"
 msgstr "摘自《%(book_title)s》的节录"
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "描述:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "页数"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, python-format
 msgid "Your review of '%(book_title)s'"
 msgstr "你对《%(book_title)s》的书评"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
 msgstr "书评:"
 
@@ -2531,13 +2885,13 @@ msgstr "删除这些阅读日期吗？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正要删除这篇阅读经过以及与之相关的 %(count)s 次进度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "喜欢"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "取消喜欢"
 
@@ -2583,12 +2937,20 @@ msgstr "取消关注"
 msgid "Accept"
 msgstr "接受"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "没有评价"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, fuzzy, python-format
+#| msgid "%(rating)s star"
+#| msgid_plural "%(rating)s stars"
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] "%(rating)s 星"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2732,7 +3094,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
 msgstr "更新进度"
 
@@ -2770,37 +3132,59 @@ msgstr "移动书目"
 msgid "More shelves"
 msgstr "更多书架"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr "开始阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr "完成阅读"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr "想要阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr "完成阅读"
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
-msgstr "显示更多"
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning"
+msgstr "内容"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
-msgstr "显示更少"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+#, fuzzy
+#| msgid "View status"
+msgid "Show status"
+msgstr "浏览状态"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "第 %(page)s 页"
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "完成了 %(percent)s%% ！"
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr "在新窗口中打开图像"
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+#, fuzzy
+#| msgid "Like status"
+msgid "Hide status"
+msgstr "喜欢状态"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, python-format
 msgid "commented on <a href=\"%(book_path)s\">%(book)s</a>"
@@ -2871,7 +3255,7 @@ msgstr "删除并重新起草"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr "发送私信"
 
@@ -2904,6 +3288,14 @@ msgstr "升序排序"
 msgid "Sorted descending"
 msgstr "降序排序"
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr "显示更多"
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr "显示更少"
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "用户个人资料"
@@ -2958,38 +3350,49 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有书目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "完成时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -3044,7 +3447,25 @@ msgstr[0] "%(mutuals_display)s 个你也关注的关注者"
 msgid "No followers you follow"
 msgstr "没有你关注的关注者"
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+#, fuzzy
+#| msgid "Permanently deleted"
+msgid "Permanently delete user"
+msgstr "已永久删除"
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Your password:"
+msgstr "确认密码:"
+
+#: bookwyrm/templates/user_admin/user.html:8
 msgid "Back to users"
 msgstr "回到用户"
 
@@ -3071,31 +3492,83 @@ msgid "Remote instance"
 msgstr "移除服务器"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 msgid "Active"
 msgstr "活跃"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
 msgstr "停用"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
 msgstr "未设置"
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr "用户详情"
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 msgid "View user profile"
 msgstr "查看用户个人资料"
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr "本站"
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote"
+msgstr "移除"
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr "用户详情"
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+#, fuzzy
+#| msgid "Email"
+msgid "Email:"
+msgstr "邮箱"
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+#, fuzzy
+#| msgid "Directory"
+msgid "(View reports)"
+msgstr "目录"
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+#, fuzzy
+#| msgid "Blocked by us:"
+msgid "Blocked by count:"
+msgstr "我们所屏蔽的:"
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+#, fuzzy
+#| msgid "last active"
+msgid "Last active date:"
+msgstr "最后活跃"
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+#, fuzzy
+#| msgid "Manually approve followers:"
+msgid "Manually approved followers:"
+msgstr "手动批准关注者:"
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+#, fuzzy
+#| msgid "Discover"
+msgid "Discoverable:"
+msgstr "发现"
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+msgid "Deactivation reason:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 msgid "Instance details"
 msgstr "实例详情"
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr "查看实例"
 
@@ -3103,35 +3576,35 @@ msgstr "查看实例"
 msgid "Permanently deleted"
 msgstr "已永久删除"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr "停用用户"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr "取消停用用户"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr "访问级别:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "文件超过了最大大小: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr "%(title)s：%(subtitle)s"
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr "用户名或密码不正确"
-
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "不是有效的 csv 文件"
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr "用户名或密码不正确"
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "没有找到使用该邮箱的用户。"
@@ -3146,11 +3619,26 @@ msgstr "密码重置连接已发送给 %s"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "This instance is closed"
+#~ msgstr "本实例不开放。"
+
+#~ msgid "Contact an administrator to get an invite"
+#~ msgstr "联系管理员以取得邀请"
+
+#~ msgid "Spoiler alert:"
+#~ msgstr "剧透警告:"
+
+#~ msgid "Date federated"
+#~ msgstr "跨站日期"
+
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "\"%(query)s\" 的搜索结果"
+
+#~ msgid "Matching Books"
+#~ msgstr "匹配的书目"
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地时间线"
 
 #~ msgid "Federated Timeline"
 #~ msgstr "跨站时间线"
-
-#~ msgid "Local"
-#~ msgstr "本站"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo
index a1075ef48..4dd8c915c 100644
Binary files a/locale/zh_Hant/LC_MESSAGES/django.mo and b/locale/zh_Hant/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index 2a39f3887..b9fbcc39b 100644
--- a/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/locale/zh_Hant/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-16 21:26+0000\n"
+"POT-Creation-Date: 2021-09-20 19:44+0000\n"
 "PO-Revision-Date: 2021-06-30 10:36+0000\n"
 "Last-Translator: Grace Cheng <chengracecwy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,62 +18,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:233
+#: bookwyrm/forms.py:242
 msgid "A user with this email already exists."
 msgstr "已經存在使用該郵箱的使用者。"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:256
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:257
 msgid "One Week"
 msgstr "一週"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:258
 msgid "One Month"
 msgstr "一個月"
 
-#: bookwyrm/forms.py:250
+#: bookwyrm/forms.py:259
 msgid "Does Not Expire"
 msgstr "永不失效"
 
-#: bookwyrm/forms.py:255
+#: bookwyrm/forms.py:264
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:258
+#: bookwyrm/forms.py:267
 msgid "Unlimited"
 msgstr "不受限"
 
-#: bookwyrm/forms.py:308
+#: bookwyrm/forms.py:329
 msgid "List Order"
 msgstr "列表順序"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:330
 msgid "Book Title"
 msgstr "書名"
 
-#: bookwyrm/forms.py:310
-#: bookwyrm/templates/snippets/create_status/review.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:85
-#: bookwyrm/templates/user/shelf/shelf.html:116
+#: bookwyrm/forms.py:331
+#: bookwyrm/templates/snippets/create_status/review.html:33
+#: bookwyrm/templates/user/shelf/shelf.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:148
 msgid "Rating"
 msgstr "評價"
 
-#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107
+#: bookwyrm/forms.py:333 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "排序方式"
 
-#: bookwyrm/forms.py:316
+#: bookwyrm/forms.py:337
 msgid "Ascending"
 msgstr "升序"
 
-#: bookwyrm/forms.py:317
+#: bookwyrm/forms.py:338
 msgid "Descending"
 msgstr "降序"
 
+#: bookwyrm/importers/importer.py:75
+msgid "Error loading book"
+msgstr ""
+
+#: bookwyrm/importers/importer.py:88
+msgid "Could not find a match for book"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:13
+#, fuzzy
+#| msgid "Ascending"
+msgid "Pending"
+msgstr "升序"
+
+#: bookwyrm/models/base_model.py:14
+msgid "Self deletion"
+msgstr ""
+
+#: bookwyrm/models/base_model.py:15
+#, fuzzy
+#| msgid "Moderator Comments"
+msgid "Moderator suspension"
+msgstr "監察員評論"
+
+#: bookwyrm/models/base_model.py:16
+#, fuzzy
+#| msgid "Mentions"
+msgid "Moderator deletion"
+msgstr "提及"
+
+#: bookwyrm/models/base_model.py:17
+#, fuzzy
+#| msgid "Un-block"
+msgid "Domain block"
+msgstr "取消封鎖"
+
+#: bookwyrm/models/federated_server.py:11
+#: bookwyrm/templates/settings/edit_server.html:40
+#: bookwyrm/templates/settings/federation.html:19
+msgid "Federated"
+msgstr "跨站"
+
+#: bookwyrm/models/federated_server.py:12
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:10
+#: bookwyrm/templates/settings/federation.html:23
+msgid "Blocked"
+msgstr "已封鎖"
+
 #: bookwyrm/models/fields.py:27
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -84,55 +133,55 @@ msgstr "%(value)s 不是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的使用者名稱"
 
-#: bookwyrm/models/fields.py:174 bookwyrm/templates/layout.html:164
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:169
 msgid "username"
 msgstr "使用者名稱"
 
-#: bookwyrm/models/fields.py:179
+#: bookwyrm/models/fields.py:186
 msgid "A user with that username already exists."
 msgstr "已經存在使用該名稱的使用者。"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home Timeline"
 msgstr "主頁時間線"
 
-#: bookwyrm/settings.py:123
+#: bookwyrm/settings.py:116
 msgid "Home"
 msgstr "主頁"
 
-#: bookwyrm/settings.py:124
+#: bookwyrm/settings.py:117
 #, fuzzy
 #| msgid "Book Title"
 msgid "Books Timeline"
 msgstr "書名"
 
-#: bookwyrm/settings.py:124 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:117 bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:81
 msgid "Books"
 msgstr "書目"
 
-#: bookwyrm/settings.py:170
+#: bookwyrm/settings.py:163
 msgid "English"
 msgstr "English（英語）"
 
-#: bookwyrm/settings.py:171
+#: bookwyrm/settings.py:164
 msgid "German"
 msgstr "Deutsch（德語）"
 
-#: bookwyrm/settings.py:172
+#: bookwyrm/settings.py:165
 msgid "Spanish"
 msgstr "Español（西班牙語）"
 
-#: bookwyrm/settings.py:173
+#: bookwyrm/settings.py:166
 msgid "French"
 msgstr "Français（法語）"
 
-#: bookwyrm/settings.py:174
+#: bookwyrm/settings.py:167
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: bookwyrm/settings.py:175
+#: bookwyrm/settings.py:168
 #, fuzzy
 #| msgid "Tranditional Chinese"
 msgid "Traditional Chinese"
@@ -181,12 +230,12 @@ msgid "Wikipedia"
 msgstr "維基百科"
 
 #: bookwyrm/templates/author/author.html:69
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:94
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 檢視"
 
 #: bookwyrm/templates/author/author.html:77
-#: bookwyrm/templates/book/book.html:98
+#: bookwyrm/templates/book/book.html:97
 msgid "View on Inventaire"
 msgstr "在 Inventaire 檢視"
 
@@ -225,7 +274,7 @@ msgid "Last edited by:"
 msgstr "最後編輯者:"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:124
 msgid "Metadata"
 msgstr "元資料"
 
@@ -237,9 +286,9 @@ msgid "Name:"
 msgstr "名稱:"
 
 #: bookwyrm/templates/author/edit_author.html:43
-#: bookwyrm/templates/book/edit_book.html:162
-#: bookwyrm/templates/book/edit_book.html:171
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "Separate multiple values with commas."
 msgstr "請用逗號(,)分隔多個值。"
 
@@ -268,7 +317,7 @@ msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/author/edit_author.html:89
-#: bookwyrm/templates/book/edit_book.html:293
+#: bookwyrm/templates/book/edit_book.html:300
 msgid "Inventaire ID:"
 msgstr "Inventaire ID:"
 
@@ -281,126 +330,128 @@ msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:116
-#: bookwyrm/templates/book/book.html:141
-#: bookwyrm/templates/book/edit_book.html:321
-#: bookwyrm/templates/book/readthrough.html:77
-#: bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:78
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:328
+#: bookwyrm/templates/book/readthrough.html:76
+#: bookwyrm/templates/lists/bookmark_button.html:15
+#: bookwyrm/templates/lists/form.html:44
+#: bookwyrm/templates/preferences/edit_user.html:80
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:108
+#: bookwyrm/templates/settings/site.html:120
 #: bookwyrm/templates/snippets/reading_modals/layout.html:16
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:45
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:64
 msgid "Save"
 msgstr "儲存"
 
 #: bookwyrm/templates/author/edit_author.html:117
-#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:322
-#: bookwyrm/templates/book/readthrough.html:78
+#: bookwyrm/templates/book/edit_book.html:329
+#: bookwyrm/templates/book/readthrough.html:77
+#: bookwyrm/templates/lists/delete_list_modal.html:17
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:44
 msgid "Cancel"
 msgstr "取消"
 
-#: bookwyrm/templates/book/book.html:48
+#: bookwyrm/templates/book/book.html:47
 #: bookwyrm/templates/discover/large-book.html:22
 #: bookwyrm/templates/landing/large-book.html:25
 #: bookwyrm/templates/landing/small-book.html:18
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57
+#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
 msgid "Edit Book"
 msgstr "編輯書目"
 
-#: bookwyrm/templates/book/book.html:74
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "新增封面"
 
-#: bookwyrm/templates/book/book.html:78
+#: bookwyrm/templates/book/book.html:77
 msgid "Failed to load cover"
 msgstr "載入封面失敗"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 則書評)"
 
-#: bookwyrm/templates/book/book.html:130
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "新增描述"
 
-#: bookwyrm/templates/book/book.html:137
-#: bookwyrm/templates/book/edit_book.html:136
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:143
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "描述:"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:150
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 個版本</a>"
 
-#: bookwyrm/templates/book/book.html:159
+#: bookwyrm/templates/book/book.html:158
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 書架上。"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:164
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本書的 <a href=\"%(book_path)s\">另一個版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 書架上。"
 
-#: bookwyrm/templates/book/book.html:176
+#: bookwyrm/templates/book/book.html:175
 msgid "Your reading activity"
 msgstr "你的閱讀活動"
 
-#: bookwyrm/templates/book/book.html:179
+#: bookwyrm/templates/book/book.html:178
 msgid "Add read dates"
 msgstr "新增閱讀日期"
 
-#: bookwyrm/templates/book/book.html:188
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "建立"
 
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:197
 msgid "You don't have any reading activity for this book."
 msgstr "你還未閱讀這本書。"
 
-#: bookwyrm/templates/book/book.html:217
+#: bookwyrm/templates/book/book.html:216
 msgid "Reviews"
 msgstr "書評"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:221
 msgid "Your reviews"
 msgstr "你的書評"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:227
 msgid "Your comments"
 msgstr "你的評論"
 
-#: bookwyrm/templates/book/book.html:234
+#: bookwyrm/templates/book/book.html:233
 msgid "Your quotes"
 msgstr "你的引用"
 
-#: bookwyrm/templates/book/book.html:270
+#: bookwyrm/templates/book/book.html:269
 msgid "Subjects"
 msgstr "主題"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:281
 msgid "Places"
 msgstr "地點"
 
-#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68
+#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:73
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -408,13 +459,15 @@ msgstr "地點"
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:304
+#: bookwyrm/templates/book/book.html:303
 msgid "Add to list"
 msgstr "新增到列表"
 
-#: bookwyrm/templates/book/book.html:314
+#: bookwyrm/templates/book/book.html:313
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
+#: bookwyrm/templates/settings/domain_form.html:26
+#: bookwyrm/templates/settings/ip_address_form.html:32
 msgid "Add"
 msgstr "新增"
 
@@ -423,22 +476,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:301
+#: bookwyrm/templates/book/edit_book.html:308
 msgid "OCLC Number:"
 msgstr "OCLC 號:"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:309
+#: bookwyrm/templates/book/edit_book.html:316
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:229
+#: bookwyrm/templates/book/edit_book.html:236
 msgid "Upload cover:"
 msgstr "上載封面:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:242
 msgid "Load cover from url:"
 msgstr "從網址載入封面:"
 
@@ -453,135 +506,135 @@ msgstr "編輯 \"%(book_title)s\""
 msgid "Add Book"
 msgstr "新增書目"
 
-#: bookwyrm/templates/book/edit_book.html:54
+#: bookwyrm/templates/book/edit_book.html:61
 msgid "Confirm Book Info"
 msgstr "確認書目資料"
 
-#: bookwyrm/templates/book/edit_book.html:62
+#: bookwyrm/templates/book/edit_book.html:69
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
 msgstr "\"%(name)s\" 是已存在的作者嗎？"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:78
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "<em>%(book_title)s</em> 的作者"
 
-#: bookwyrm/templates/book/edit_book.html:75
+#: bookwyrm/templates/book/edit_book.html:82
 msgid "This is a new author"
 msgstr "這是一位新的作者"
 
-#: bookwyrm/templates/book/edit_book.html:82
+#: bookwyrm/templates/book/edit_book.html:89
 #, python-format
 msgid "Creating a new author: %(name)s"
 msgstr "正在建立新的作者:  %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:89
+#: bookwyrm/templates/book/edit_book.html:96
 msgid "Is this an edition of an existing work?"
 msgstr "這是已存在的作品的另一個版本嗎？"
 
-#: bookwyrm/templates/book/edit_book.html:97
+#: bookwyrm/templates/book/edit_book.html:104
 msgid "This is a new work"
 msgstr "這是一個新的作品。"
 
-#: bookwyrm/templates/book/edit_book.html:104
+#: bookwyrm/templates/book/edit_book.html:111
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "確認"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:120
-#: bookwyrm/templates/snippets/create_status/review.html:18
+#: bookwyrm/templates/book/edit_book.html:127
+#: bookwyrm/templates/snippets/create_status/review.html:16
 msgid "Title:"
 msgstr "標題:"
 
-#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "Subtitle:"
 msgstr "副標題:"
 
-#: bookwyrm/templates/book/edit_book.html:144
+#: bookwyrm/templates/book/edit_book.html:151
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:159
 msgid "Series number:"
 msgstr "系列編號:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:167
 msgid "Languages:"
 msgstr "語言:"
 
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "First published date:"
 msgstr "初版時間:"
 
-#: bookwyrm/templates/book/edit_book.html:186
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Published date:"
 msgstr "出版時間:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:202
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:202
+#: bookwyrm/templates/book/edit_book.html:209
 #, fuzzy, python-format
 #| msgid "Remove from %(name)s"
 msgid "Remove %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:212
 #, fuzzy, python-format
 #| msgid "Remove from %(name)s"
 msgid "Author page for %(name)s"
 msgstr "從 %(name)s 移除"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "Add Authors:"
 msgstr "新增作者:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "John Doe, Jane Smith"
 msgstr "John Doe, Jane Smith"
 
-#: bookwyrm/templates/book/edit_book.html:220
-#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/user/shelf/shelf.html:110
 msgid "Cover"
 msgstr "封面"
 
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:255
 msgid "Physical Properties"
 msgstr "實體性質"
 
-#: bookwyrm/templates/book/edit_book.html:250
+#: bookwyrm/templates/book/edit_book.html:257
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格式:"
 
-#: bookwyrm/templates/book/edit_book.html:258
+#: bookwyrm/templates/book/edit_book.html:265
 msgid "Pages:"
 msgstr "頁數:"
 
-#: bookwyrm/templates/book/edit_book.html:267
+#: bookwyrm/templates/book/edit_book.html:274
 msgid "Book Identifiers"
 msgstr "書目標識號"
 
-#: bookwyrm/templates/book/edit_book.html:269
+#: bookwyrm/templates/book/edit_book.html:276
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:277
+#: bookwyrm/templates/book/edit_book.html:284
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:285
+#: bookwyrm/templates/book/edit_book.html:292
 msgid "Openlibrary ID:"
 msgstr "Openlibrary ID:"
 
@@ -647,33 +700,40 @@ msgstr "評價了"
 msgid "Progress Updates:"
 msgstr "進度更新:"
 
-#: bookwyrm/templates/book/readthrough.html:14
+#: bookwyrm/templates/book/readthrough.html:13
 msgid "finished"
 msgstr "已完成"
 
-#: bookwyrm/templates/book/readthrough.html:25
+#: bookwyrm/templates/book/readthrough.html:24
 msgid "Show all updates"
 msgstr "顯示所有更新"
 
-#: bookwyrm/templates/book/readthrough.html:41
+#: bookwyrm/templates/book/readthrough.html:40
 msgid "Delete this progress update"
 msgstr "刪除此進度更新"
 
-#: bookwyrm/templates/book/readthrough.html:52
+#: bookwyrm/templates/book/readthrough.html:51
 msgid "started"
 msgstr "已開始"
 
-#: bookwyrm/templates/book/readthrough.html:59
-#: bookwyrm/templates/book/readthrough.html:73
+#: bookwyrm/templates/book/readthrough.html:58
+#: bookwyrm/templates/book/readthrough.html:72
 msgid "Edit read dates"
 msgstr "編輯閱讀日期"
 
-#: bookwyrm/templates/book/readthrough.html:63
+#: bookwyrm/templates/book/readthrough.html:62
 msgid "Delete these read dates"
 msgstr "刪除這些閱讀日期"
 
+#: bookwyrm/templates/book/search_filter.html:5
+#, fuzzy
+#| msgid "Search Results"
+msgid "Search editions"
+msgstr "搜尋結果"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
+#: bookwyrm/templates/components/tooltip.html:7
 #: bookwyrm/templates/feed/layout.html:71
 #: bookwyrm/templates/get_started/layout.html:20
 #: bookwyrm/templates/get_started/layout.html:53
@@ -682,6 +742,10 @@ msgstr "刪除這些閱讀日期"
 msgid "Close"
 msgstr "關閉"
 
+#: bookwyrm/templates/components/tooltip.html:3
+msgid "Help"
+msgstr ""
+
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
 msgstr "撰寫狀態"
@@ -707,14 +771,16 @@ msgid "Sorry! We couldn't find that code."
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:19
+#: bookwyrm/templates/user_admin/user_info.html:100
 #, fuzzy
 #| msgid "Confirm password:"
 msgid "Confirmation code:"
 msgstr "確認密碼:"
 
 #: bookwyrm/templates/confirm_email/confirm_email.html:25
-#: bookwyrm/templates/landing/landing_layout.html:70
+#: bookwyrm/templates/landing/layout.html:73
 #: bookwyrm/templates/moderation/report_modal.html:33
+#: bookwyrm/templates/settings/dashboard.html:93
 msgid "Submit"
 msgstr "提交"
 
@@ -727,7 +793,7 @@ msgid "Resend confirmation link"
 msgstr ""
 
 #: bookwyrm/templates/confirm_email/resend_form.html:11
-#: bookwyrm/templates/landing/landing_layout.html:64
+#: bookwyrm/templates/landing/layout.html:67
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
@@ -754,7 +820,7 @@ msgstr "跨站社群"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:99
 msgid "Directory"
 msgstr "目錄"
 
@@ -826,7 +892,7 @@ msgstr "所有已知使用者"
 
 #: bookwyrm/templates/discover/discover.html:4
 #: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:71
+#: bookwyrm/templates/layout.html:76
 #, fuzzy
 #| msgid "Discard"
 msgid "Discover"
@@ -958,7 +1024,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "與 <a href=\"%(path)s\">%(username)s</a> 私信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:104
+#: bookwyrm/templates/layout.html:109
 msgid "Direct Messages"
 msgstr "私信"
 
@@ -994,18 +1060,19 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "現在這裡還沒有任何書目！嘗試著從搜尋某本書開始吧"
 
 #: bookwyrm/templates/feed/layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "To Read"
 msgstr "想讀"
 
 #: bookwyrm/templates/feed/layout.html:26
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Currently Reading"
 msgstr "在讀"
 
 #: bookwyrm/templates/feed/layout.html:27
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
-#: bookwyrm/templates/user/shelf/shelf.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12
+#: bookwyrm/templates/user/shelf/shelf.html:42
 msgid "Read"
 msgstr "讀過"
 
@@ -1015,11 +1082,23 @@ msgstr "讀過"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s 閱讀目標"
 
-#: bookwyrm/templates/feed/suggested_users.html:3
+#: bookwyrm/templates/feed/suggested_users.html:5
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "可以關注的人"
 
+#: bookwyrm/templates/feed/suggested_users.html:9
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Don't show suggested users"
+msgstr "在推薦的使用者中顯示此帳號:"
+
+#: bookwyrm/templates/feed/suggested_users.html:14
+#, fuzzy
+#| msgid "Directory"
+msgid "View directory"
+msgstr "目錄"
+
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
@@ -1030,12 +1109,11 @@ msgid "What are you reading?"
 msgstr "你在閱讀什麼？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/layout.html:43 bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "搜尋書目"
 
 #: bookwyrm/templates/get_started/books.html:11
-#: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "沒有找到 \"%(query)s\" 的書目"
@@ -1049,7 +1127,7 @@ msgstr "你可以在開始使用 %(site_name)s 後新增書目。"
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:44 bookwyrm/templates/layout.html:45
+#: bookwyrm/templates/layout.html:49 bookwyrm/templates/layout.html:50
 #: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1076,7 +1154,7 @@ msgid "Save &amp; continue"
 msgstr "儲存 &amp; 繼續"
 
 #: bookwyrm/templates/get_started/layout.html:5
-#: bookwyrm/templates/landing/landing_layout.html:5
+#: bookwyrm/templates/landing/layout.html:5
 msgid "Welcome"
 msgstr "歡迎"
 
@@ -1130,12 +1208,12 @@ msgid "Avatar:"
 msgstr "頭像:"
 
 #: bookwyrm/templates/get_started/profile.html:42
-#: bookwyrm/templates/preferences/edit_user.html:52
+#: bookwyrm/templates/preferences/edit_user.html:62
 msgid "Manually approve followers:"
 msgstr "手動批准關注者:"
 
 #: bookwyrm/templates/get_started/profile.html:48
-#: bookwyrm/templates/preferences/edit_user.html:66
+#: bookwyrm/templates/preferences/edit_user.html:54
 msgid "Show this account in suggested users:"
 msgstr "在推薦的使用者中顯示此帳號:"
 
@@ -1182,125 +1260,130 @@ msgstr "你 %(year)s 的書目"
 msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的書目"
 
-#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/user/shelf/shelf.html:40
+#: bookwyrm/templates/import/import.html:5
+#: bookwyrm/templates/import/import.html:9
+#: bookwyrm/templates/user/shelf/shelf.html:57
 msgid "Import Books"
 msgstr "匯入書目"
 
-#: bookwyrm/templates/import.html:16
+#: bookwyrm/templates/import/import.html:18
 msgid "Data source:"
 msgstr "資料來源:"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import/import.html:37
 msgid "Data file:"
 msgstr "資料檔案:"
 
-#: bookwyrm/templates/import.html:40
+#: bookwyrm/templates/import/import.html:45
 msgid "Include reviews"
 msgstr "納入書評"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import/import.html:50
 msgid "Privacy setting for imported reviews:"
 msgstr "匯入書評的隱私設定"
 
-#: bookwyrm/templates/import.html:51
+#: bookwyrm/templates/import/import.html:56
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "匯入"
 
-#: bookwyrm/templates/import.html:56
+#: bookwyrm/templates/import/import.html:61
 msgid "Recent Imports"
 msgstr "最近的匯入"
 
-#: bookwyrm/templates/import.html:58
+#: bookwyrm/templates/import/import.html:63
 msgid "No recent imports"
 msgstr "無最近的匯入"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import/import_status.html:6
+#: bookwyrm/templates/import/import_status.html:10
 msgid "Import Status"
 msgstr "匯入狀態"
 
-#: bookwyrm/templates/import_status.html:11
+#: bookwyrm/templates/import/import_status.html:11
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to imports"
 msgstr "回到舉報"
 
-#: bookwyrm/templates/import_status.html:15
+#: bookwyrm/templates/import/import_status.html:15
 msgid "Import started:"
 msgstr "匯入開始:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import/import_status.html:20
 msgid "Import completed:"
 msgstr "匯入完成:"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import/import_status.html:24
 msgid "TASK FAILED"
 msgstr "任務失敗"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import/import_status.html:32
 msgid "Import still in progress."
 msgstr "還在匯入中。"
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import/import_status.html:34
 msgid "(Hit reload to update!)"
 msgstr "（按下重新載入來更新！）"
 
-#: bookwyrm/templates/import_status.html:41
+#: bookwyrm/templates/import/import_status.html:41
 msgid "Failed to load"
 msgstr "載入失敗"
 
-#: bookwyrm/templates/import_status.html:50
+#: bookwyrm/templates/import/import_status.html:50
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "跳轉至列表底部來選取 %(failed_count)s 個匯入失敗的項目。"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import/import_status.html:62
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import/import_status.html:82
 msgid "Select all"
 msgstr "全選"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import/import_status.html:85
 msgid "Retry items"
 msgstr "重試項目"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import/import_status.html:112
 msgid "Successfully imported"
 msgstr "成功匯入了"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import/import_status.html:114
 #, fuzzy
 #| msgid "Import still in progress."
 msgid "Import Progress"
 msgstr "還在匯入中。"
 
-#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/import/import_status.html:119
 msgid "Book"
 msgstr "書目"
 
-#: bookwyrm/templates/import_status.html:122
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:99
+#: bookwyrm/templates/import/import_status.html:122
+#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:131
 msgid "Title"
 msgstr "標題"
 
-#: bookwyrm/templates/import_status.html:125
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:102
+#: bookwyrm/templates/import/import_status.html:125
+#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "Author"
 msgstr "作者"
 
-#: bookwyrm/templates/import_status.html:148
+#: bookwyrm/templates/import/import_status.html:148
 msgid "Imported"
 msgstr "已匯入"
 
-#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:51
+#: bookwyrm/templates/import/tooltip.html:6
+msgid "You can download your GoodReads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"noopener\">Import/Export page</a> of your GoodReads account."
+msgstr ""
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:8
+#: bookwyrm/templates/login.html:49
 msgid "Create an Account"
 msgstr "建立帳號"
 
@@ -1312,19 +1395,6 @@ msgstr "沒有權限"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉！此邀請碼已不再有效。"
 
-#: bookwyrm/templates/isbn_search_results.html:4
-msgid "Search Results"
-msgstr "搜尋結果"
-
-#: bookwyrm/templates/isbn_search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "\"%(query)s\" 的搜尋結果"
-
-#: bookwyrm/templates/isbn_search_results.html:14
-msgid "Matching Books"
-msgstr "匹配的書目"
-
 #: bookwyrm/templates/landing/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -1344,126 +1414,145 @@ msgstr "隱私政策"
 msgid "Recent Books"
 msgstr "最近書目"
 
-#: bookwyrm/templates/landing/landing_layout.html:17
+#: bookwyrm/templates/landing/layout.html:17
 msgid "Decentralized"
 msgstr "去中心化"
 
-#: bookwyrm/templates/landing/landing_layout.html:23
+#: bookwyrm/templates/landing/layout.html:23
 msgid "Friendly"
 msgstr "友好"
 
-#: bookwyrm/templates/landing/landing_layout.html:29
+#: bookwyrm/templates/landing/layout.html:29
 msgid "Anti-Corporate"
 msgstr "反企業"
 
-#: bookwyrm/templates/landing/landing_layout.html:44
+#: bookwyrm/templates/landing/layout.html:45
 #, python-format
 msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
-#: bookwyrm/templates/landing/landing_layout.html:51
-#: bookwyrm/templates/login.html:56
-msgid "This instance is closed"
-msgstr "本實例不開放。"
-
-#: bookwyrm/templates/landing/landing_layout.html:57
-msgid "Thank you! Your request has been received."
-msgstr "謝謝你！我們已經受到了你的請求。"
-
-#: bookwyrm/templates/landing/landing_layout.html:60
+#: bookwyrm/templates/landing/layout.html:47
 msgid "Request an Invitation"
 msgstr "請求邀請"
 
-#: bookwyrm/templates/landing/landing_layout.html:79
+#: bookwyrm/templates/landing/layout.html:49
+#, fuzzy, python-format
+#| msgid "Registration closed text:"
+msgid "%(name)s registration is closed"
+msgstr "註冊關閉文字:"
+
+#: bookwyrm/templates/landing/layout.html:60
+msgid "Thank you! Your request has been received."
+msgstr "謝謝你！我們已經受到了你的請求。"
+
+#: bookwyrm/templates/landing/layout.html:82
 msgid "Your Account"
 msgstr "你的帳號"
 
-#: bookwyrm/templates/layout.html:40
-msgid "Search for a book or user"
+#: bookwyrm/templates/layout.html:41
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a book, user, or list"
 msgstr "搜尋書目或使用者"
 
-#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55
+#: bookwyrm/templates/layout.html:59 bookwyrm/templates/layout.html:60
 msgid "Main navigation menu"
 msgstr "主導航選單"
 
-#: bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/layout.html:70
 msgid "Feed"
 msgstr "動態"
 
-#: bookwyrm/templates/layout.html:99
+#: bookwyrm/templates/layout.html:104
 msgid "Your Books"
 msgstr "你的書目"
 
-#: bookwyrm/templates/layout.html:109
+#: bookwyrm/templates/layout.html:114
 msgid "Settings"
 msgstr "設定"
 
-#: bookwyrm/templates/layout.html:118
-#: bookwyrm/templates/settings/admin_layout.html:31
+#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/settings/layout.html:40
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "邀請"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Admin"
 msgstr "管理員"
 
-#: bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/layout.html:137
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:140 bookwyrm/templates/layout.html:141
+#: bookwyrm/templates/layout.html:145 bookwyrm/templates/layout.html:146
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/layout.html:167
-#: bookwyrm/templates/login.html:22
+#: bookwyrm/templates/layout.html:168 bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/login.html:21
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "password"
 msgstr "密碼"
 
-#: bookwyrm/templates/layout.html:169 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/layout.html:174 bookwyrm/templates/login.html:40
 msgid "Forgot your password?"
 msgstr "忘記了密碼？"
 
-#: bookwyrm/templates/layout.html:172 bookwyrm/templates/login.html:10
-#: bookwyrm/templates/login.html:38
+#: bookwyrm/templates/layout.html:177 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:37
 msgid "Log in"
 msgstr "登入"
 
-#: bookwyrm/templates/layout.html:180
+#: bookwyrm/templates/layout.html:185
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:218
+#: bookwyrm/templates/layout.html:219
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully posted status"
+msgstr "成功匯入了"
+
+#: bookwyrm/templates/layout.html:220
+#, fuzzy
+#| msgid "Boost status"
+msgid "Error posting status"
+msgstr "轉發狀態"
+
+#: bookwyrm/templates/layout.html:228
 msgid "About this instance"
 msgstr "關於本實例"
 
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:232
 msgid "Contact site admin"
 msgstr "聯絡網站管理員"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:236
 msgid "Documentation"
 msgstr "文件:"
 
-#: bookwyrm/templates/layout.html:233
+#: bookwyrm/templates/layout.html:243
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支援 %(site_name)s"
 
-#: bookwyrm/templates/layout.html:237
+#: bookwyrm/templates/layout.html:247
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是開源軟體。你可以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 貢獻或報告問題。"
 
+#: bookwyrm/templates/lists/bookmark_button.html:30
+msgid "Un-save"
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
@@ -1503,8 +1592,27 @@ msgstr "批准"
 msgid "Discard"
 msgstr "放棄"
 
+#: bookwyrm/templates/lists/delete_list_modal.html:4
+#, fuzzy
+#| msgid "Delete this progress update"
+msgid "Delete this list?"
+msgstr "刪除此進度更新"
+
+#: bookwyrm/templates/lists/delete_list_modal.html:7
+msgid "This action cannot be un-done"
+msgstr ""
+
+#: bookwyrm/templates/lists/delete_list_modal.html:15
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/settings/email_blocklist.html:49
+#: bookwyrm/templates/settings/ip_blocklist.html:36
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "刪除"
+
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:16
+#: bookwyrm/templates/lists/layout.html:16
 msgid "Edit List"
 msgstr "編輯列表"
 
@@ -1539,6 +1647,12 @@ msgstr "開放"
 msgid "Anyone can add books to this list"
 msgstr "任何人都可以向此列表新增書目"
 
+#: bookwyrm/templates/lists/form.html:49
+#, fuzzy
+#| msgid "Delete status"
+msgid "Delete list"
+msgstr "刪除狀態"
+
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr "你成功！向該列表推薦了一本書"
@@ -1603,28 +1717,42 @@ msgstr "沒有符合 \"%(query)s\" 請求的書目"
 msgid "Suggest"
 msgstr "推薦"
 
+#: bookwyrm/templates/lists/list_items.html:15
+#, fuzzy
+#| msgid "Save"
+msgid "Saved"
+msgstr "儲存"
+
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
 msgstr "你的列表"
 
+#: bookwyrm/templates/lists/lists.html:35
+#, fuzzy
+#| msgid "Lists"
+msgid "All Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/lists/lists.html:39
+#, fuzzy
+#| msgid "Create List"
+msgid "Saved Lists"
+msgstr "建立列表"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登入"
 
-#: bookwyrm/templates/login.html:16
+#: bookwyrm/templates/login.html:15
 msgid "Success! Email address confirmed."
 msgstr ""
 
-#: bookwyrm/templates/login.html:28 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/login.html:27 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "密碼:"
 
-#: bookwyrm/templates/login.html:57
-msgid "Contact an administrator to get an invite"
-msgstr "聯絡管理員以取得邀請"
-
-#: bookwyrm/templates/login.html:68
+#: bookwyrm/templates/login.html:62
 msgid "More about this site"
 msgstr "關於本網站的更多"
 
@@ -1698,7 +1826,7 @@ msgstr "舉報: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/layout.html:55
 msgid "Reports"
 msgstr "舉報"
 
@@ -1878,6 +2006,7 @@ msgstr "新密碼:"
 #: bookwyrm/templates/preferences/delete_user.html:7
 #: bookwyrm/templates/preferences/delete_user.html:26
 #: bookwyrm/templates/preferences/layout.html:23
+#: bookwyrm/templates/user_admin/delete_user_form.html:23
 #, fuzzy
 #| msgid "Create an Account"
 msgid "Delete Account"
@@ -1897,21 +2026,29 @@ msgid "Edit Profile"
 msgstr "編輯使用者資料"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
-msgid "Show set reading goal prompt in feed:"
+#, fuzzy
+#| msgid "Show set reading goal prompt in feed:"
+msgid "Show reading goal prompt in feed:"
 msgstr "在即時動態中顯示設定的閱讀目標提示:"
 
+#: bookwyrm/templates/preferences/edit_user.html:50
+#, fuzzy
+#| msgid "Show this account in suggested users:"
+msgid "Show suggested users:"
+msgstr "在推薦的使用者中顯示此帳號:"
+
 #: bookwyrm/templates/preferences/edit_user.html:58
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "你的帳號會顯示在 <a href=\"%(path)s\">目錄</a> 中，並可能受其它 BookWyrm 使用者推薦。"
+
+#: bookwyrm/templates/preferences/edit_user.html:68
 #, fuzzy
 #| msgid "Post privacy"
 msgid "Default post privacy:"
 msgstr "發文隱私"
 
-#: bookwyrm/templates/preferences/edit_user.html:70
-#, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "你的帳號會顯示在 <a href=\"%(path)s\">目錄</a> 中，並可能受其它 BookWyrm 使用者推薦。"
-
-#: bookwyrm/templates/preferences/edit_user.html:73
+#: bookwyrm/templates/preferences/edit_user.html:75
 msgid "Preferred Timezone: "
 msgstr "偏好時區:"
 
@@ -1920,6 +2057,7 @@ msgid "Account"
 msgstr "帳號"
 
 #: bookwyrm/templates/preferences/layout.html:15
+#: bookwyrm/templates/user_admin/user_info.html:7
 msgid "Profile"
 msgstr "使用者資料"
 
@@ -1967,7 +2105,9 @@ msgstr "搜尋類別"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
-#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/settings/email_blocklist.html:27
+#: bookwyrm/templates/settings/federation.html:44
+#: bookwyrm/templates/settings/layout.html:34
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
@@ -1978,56 +2118,6 @@ msgstr "使用者"
 msgid "No results found for \"%(query)s\""
 msgstr "沒有找到 \"%(query)s\" 的搜尋結果"
 
-#: bookwyrm/templates/settings/admin_layout.html:4
-msgid "Administration"
-msgstr "管理"
-
-#: bookwyrm/templates/settings/admin_layout.html:22
-msgid "Manage Users"
-msgstr "管理使用者"
-
-#: bookwyrm/templates/settings/admin_layout.html:39
-#: bookwyrm/templates/settings/federation.html:3
-#: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Instances"
-msgstr "聯合實例"
-
-#: bookwyrm/templates/settings/admin_layout.html:44
-msgid "Instance Settings"
-msgstr "實例設定"
-
-#: bookwyrm/templates/settings/admin_layout.html:48
-#: bookwyrm/templates/settings/announcements.html:3
-#: bookwyrm/templates/settings/announcements.html:5
-msgid "Announcements"
-msgstr "公告"
-
-#: bookwyrm/templates/settings/admin_layout.html:52
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr "網站設定"
-
-#: bookwyrm/templates/settings/admin_layout.html:55
-#: bookwyrm/templates/settings/site.html:13
-msgid "Instance Info"
-msgstr "實例資訊"
-
-#: bookwyrm/templates/settings/admin_layout.html:56
-#: bookwyrm/templates/settings/site.html:39
-msgid "Images"
-msgstr "圖片"
-
-#: bookwyrm/templates/settings/admin_layout.html:57
-#: bookwyrm/templates/settings/site.html:59
-msgid "Footer Content"
-msgstr "頁尾內容"
-
-#: bookwyrm/templates/settings/admin_layout.html:58
-#: bookwyrm/templates/settings/site.html:81
-msgid "Registration"
-msgstr "註冊"
-
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
@@ -2043,12 +2133,6 @@ msgstr "回到列表"
 msgid "Edit Announcement"
 msgstr "編輯公告"
 
-#: bookwyrm/templates/settings/announcement.html:20
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "刪除"
-
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
 msgstr "可見:"
@@ -2062,14 +2146,19 @@ msgid "False"
 msgstr "否"
 
 #: bookwyrm/templates/settings/announcement.html:47
+#: bookwyrm/templates/settings/announcement_form.html:40
+#: bookwyrm/templates/settings/dashboard.html:71
 msgid "Start date:"
 msgstr "開始日期:"
 
 #: bookwyrm/templates/settings/announcement.html:54
+#: bookwyrm/templates/settings/announcement_form.html:49
+#: bookwyrm/templates/settings/dashboard.html:77
 msgid "End date:"
 msgstr "結束日期:"
 
 #: bookwyrm/templates/settings/announcement.html:60
+#: bookwyrm/templates/settings/announcement_form.html:58
 msgid "Active:"
 msgstr "活躍:"
 
@@ -2078,7 +2167,32 @@ msgstr "活躍:"
 msgid "Create Announcement"
 msgstr "建立公告"
 
+#: bookwyrm/templates/settings/announcement_form.html:16
+#, fuzzy
+#| msgid "Preview"
+msgid "Preview:"
+msgstr "預覽"
+
+#: bookwyrm/templates/settings/announcement_form.html:23
+#, fuzzy
+#| msgid "Content"
+msgid "Content:"
+msgstr "內容"
+
+#: bookwyrm/templates/settings/announcement_form.html:30
+#, fuzzy
+#| msgid "End date:"
+msgid "Event date:"
+msgstr "結束日期:"
+
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+#: bookwyrm/templates/settings/layout.html:72
+msgid "Announcements"
+msgstr "公告"
+
 #: bookwyrm/templates/settings/announcements.html:22
+#: bookwyrm/templates/settings/federation.html:36
 msgid "Date added"
 msgstr "新增日期:"
 
@@ -2095,10 +2209,11 @@ msgid "End date"
 msgstr "結束日期"
 
 #: bookwyrm/templates/settings/announcements.html:38
-#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/federation.html:46
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
+#: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Status"
 msgstr "狀態"
 
@@ -2110,6 +2225,104 @@ msgstr "啟用"
 msgid "inactive"
 msgstr "停用"
 
+#: bookwyrm/templates/settings/announcements.html:54
+#, fuzzy
+#| msgid "Announcements"
+msgid "No announcements found."
+msgstr "公告"
+
+#: bookwyrm/templates/settings/dashboard.html:6
+#: bookwyrm/templates/settings/dashboard.html:8
+#: bookwyrm/templates/settings/layout.html:26
+msgid "Dashboard"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:15
+#, fuzzy
+#| msgid "Local users"
+msgid "Total users"
+msgstr "本地使用者"
+
+#: bookwyrm/templates/settings/dashboard.html:21
+#: bookwyrm/templates/settings/dashboard_user_chart.html:12
+msgid "Active this month"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:27
+#, fuzzy
+#| msgid "Status"
+msgid "Statuses"
+msgstr "狀態"
+
+#: bookwyrm/templates/settings/dashboard.html:33
+msgid "Works"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:43
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s open report"
+msgid_plural "%(display_count)s open reports"
+msgstr[0] "%(count)d 次使用"
+
+#: bookwyrm/templates/settings/dashboard.html:54
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s invite request"
+msgid_plural "%(display_count)s invite requests"
+msgstr[0] "%(count)d 次使用"
+
+#: bookwyrm/templates/settings/dashboard.html:65
+#, fuzzy
+#| msgid "User Activity"
+msgid "Instance Activity"
+msgstr "使用者活動"
+
+#: bookwyrm/templates/settings/dashboard.html:83
+msgid "Interval:"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:86
+msgid "Days"
+msgstr ""
+
+#: bookwyrm/templates/settings/dashboard.html:87
+#, fuzzy
+#| msgid "One Week"
+msgid "Weeks"
+msgstr "一週"
+
+#: bookwyrm/templates/settings/dashboard.html:100
+#, fuzzy
+#| msgid "User Activity"
+msgid "User signup activity"
+msgstr "使用者活動"
+
+#: bookwyrm/templates/settings/dashboard.html:106
+#, fuzzy
+#| msgid "User Activity"
+msgid "Status activity"
+msgstr "使用者活動"
+
+#: bookwyrm/templates/settings/dashboard_status_chart.html:7
+#, fuzzy
+#| msgid "No statuses reported"
+msgid "Statuses posted"
+msgstr "沒有被舉報的狀態"
+
+#: bookwyrm/templates/settings/dashboard_user_chart.html:7
+msgid "Total"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:10
+msgid "Add domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/domain_form.html:11
+msgid "Domain:"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -2136,28 +2349,19 @@ msgstr "實例:"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
-#: bookwyrm/templates/user_admin/user_info.html:34
+#: bookwyrm/templates/user_admin/user_info.html:125
 msgid "Status:"
 msgstr "狀態:"
 
-#: bookwyrm/templates/settings/edit_server.html:40
-msgid "Federated"
-msgstr "跨站"
-
-#: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:10
-msgid "Blocked"
-msgstr "已封鎖"
-
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
-#: bookwyrm/templates/user_admin/user_info.html:26
+#: bookwyrm/templates/user_admin/user_info.html:117
 msgid "Software:"
 msgstr "軟件:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
-#: bookwyrm/templates/user_admin/user_info.html:30
+#: bookwyrm/templates/user_admin/user_info.html:121
 msgid "Version:"
 msgstr "版本:"
 
@@ -2165,6 +2369,36 @@ msgstr "版本:"
 msgid "Notes:"
 msgstr "備註:"
 
+#: bookwyrm/templates/settings/email_blocklist.html:5
+#: bookwyrm/templates/settings/email_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:59
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "Email Blocklist"
+msgstr "匯入封鎖列表"
+
+#: bookwyrm/templates/settings/email_blocklist.html:18
+msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked."
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:25
+msgid "Domain"
+msgstr ""
+
+#: bookwyrm/templates/settings/email_blocklist.html:29
+#: bookwyrm/templates/settings/ip_blocklist.html:27
+#, fuzzy
+#| msgid "Actions"
+msgid "Options"
+msgstr "動作"
+
+#: bookwyrm/templates/settings/email_blocklist.html:38
+#, fuzzy, python-format
+#| msgid "%(count)d uses"
+msgid "%(display_count)s user"
+msgid_plural "%(display_count)s users"
+msgstr[0] "%(count)d 次使用"
+
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "詳細"
@@ -2184,6 +2418,7 @@ msgid "View all"
 msgstr "檢視全部"
 
 #: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/user_admin/user_info.html:59
 msgid "Reports:"
 msgstr "舉報:"
 
@@ -2200,7 +2435,7 @@ msgid "Blocked by us:"
 msgstr "我們所封鎖的:"
 
 #: bookwyrm/templates/settings/federated_server.html:82
-#: bookwyrm/templates/user_admin/user_info.html:39
+#: bookwyrm/templates/user_admin/user_info.html:130
 msgid "Notes"
 msgstr "備註"
 
@@ -2231,19 +2466,102 @@ msgstr "取消封鎖"
 msgid "All users from this instance will be re-activated."
 msgstr "來自此實例的所有使用者將會被重新啟用。"
 
-#: bookwyrm/templates/settings/federation.html:19
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
+#: bookwyrm/templates/settings/layout.html:45
+msgid "Federated Instances"
+msgstr "聯合實例"
+
+#: bookwyrm/templates/settings/federation.html:32
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Instance name"
 msgstr "實例名稱"
 
-#: bookwyrm/templates/settings/federation.html:23
-msgid "Date federated"
-msgstr "跨站日期"
-
-#: bookwyrm/templates/settings/federation.html:27
+#: bookwyrm/templates/settings/federation.html:40
 msgid "Software"
 msgstr "軟體"
 
+#: bookwyrm/templates/settings/ip_address_form.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:10
+#, fuzzy
+#| msgid "Add read dates"
+msgid "Add IP address"
+msgstr "新增閱讀日期"
+
+#: bookwyrm/templates/settings/ip_address_form.html:11
+msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_address_form.html:18
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP Address:"
+msgstr "郵箱地址:"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:5
+#: bookwyrm/templates/settings/ip_blocklist.html:7
+#: bookwyrm/templates/settings/layout.html:63
+#, fuzzy
+#| msgid "Import Blocklist"
+msgid "IP Address Blocklist"
+msgstr "匯入封鎖列表"
+
+#: bookwyrm/templates/settings/ip_blocklist.html:18
+msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application."
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_blocklist.html:24
+msgid "Address"
+msgstr ""
+
+#: bookwyrm/templates/settings/ip_tooltip.html:6
+msgid "You can block IP ranges using CIDR syntax."
+msgstr ""
+
+#: bookwyrm/templates/settings/layout.html:4
+msgid "Administration"
+msgstr "管理"
+
+#: bookwyrm/templates/settings/layout.html:29
+msgid "Manage Users"
+msgstr "管理使用者"
+
+#: bookwyrm/templates/settings/layout.html:51
+#, fuzzy
+#| msgid "Mentions"
+msgid "Moderation"
+msgstr "提及"
+
+#: bookwyrm/templates/settings/layout.html:68
+msgid "Instance Settings"
+msgstr "實例設定"
+
+#: bookwyrm/templates/settings/layout.html:76
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "網站設定"
+
+#: bookwyrm/templates/settings/layout.html:79
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "實例資訊"
+
+#: bookwyrm/templates/settings/layout.html:80
+#: bookwyrm/templates/settings/site.html:44
+msgid "Images"
+msgstr "圖片"
+
+#: bookwyrm/templates/settings/layout.html:81
+#: bookwyrm/templates/settings/site.html:64
+msgid "Footer Content"
+msgstr "頁尾內容"
+
+#: bookwyrm/templates/settings/layout.html:82
+#: bookwyrm/templates/settings/site.html:86
+msgid "Registration"
+msgstr "註冊"
+
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2380,65 +2698,81 @@ msgid "Instance description:"
 msgstr "實例描述:"
 
 #: bookwyrm/templates/settings/site.html:27
+#, fuzzy
+#| msgid "Description:"
+msgid "Short description:"
+msgstr "描述:"
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support html or markdown."
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:32
 msgid "Code of conduct:"
 msgstr "行為準則:"
 
-#: bookwyrm/templates/settings/site.html:31
+#: bookwyrm/templates/settings/site.html:36
 msgid "Privacy Policy:"
 msgstr "隱私政策:"
 
-#: bookwyrm/templates/settings/site.html:42
+#: bookwyrm/templates/settings/site.html:47
 msgid "Logo:"
 msgstr "圖示:"
 
-#: bookwyrm/templates/settings/site.html:46
+#: bookwyrm/templates/settings/site.html:51
 msgid "Logo small:"
 msgstr "小號圖示:"
 
-#: bookwyrm/templates/settings/site.html:50
+#: bookwyrm/templates/settings/site.html:55
 msgid "Favicon:"
 msgstr "Favicon:"
 
-#: bookwyrm/templates/settings/site.html:61
+#: bookwyrm/templates/settings/site.html:66
 msgid "Support link:"
 msgstr "支援連結:"
 
-#: bookwyrm/templates/settings/site.html:65
+#: bookwyrm/templates/settings/site.html:70
 msgid "Support title:"
 msgstr "支援標題:"
 
-#: bookwyrm/templates/settings/site.html:69
+#: bookwyrm/templates/settings/site.html:74
 msgid "Admin email:"
 msgstr "管理員郵件:"
 
-#: bookwyrm/templates/settings/site.html:73
+#: bookwyrm/templates/settings/site.html:78
 msgid "Additional info:"
 msgstr "附加資訊:"
 
-#: bookwyrm/templates/settings/site.html:85
+#: bookwyrm/templates/settings/site.html:90
 #, fuzzy
 #| msgid "Allow registration:"
 msgid "Allow registration"
 msgstr "允許註冊:"
 
-#: bookwyrm/templates/settings/site.html:91
+#: bookwyrm/templates/settings/site.html:96
 #, fuzzy
 #| msgid "Allow invite requests:"
 msgid "Allow invite requests"
 msgstr "允許請求邀請:"
 
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:102
 msgid "Require users to confirm email address"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:99
+#: bookwyrm/templates/settings/site.html:104
 msgid "(Recommended if registration is open)"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:102
+#: bookwyrm/templates/settings/site.html:107
 msgid "Registration closed text:"
 msgstr "註冊關閉文字:"
 
+#: bookwyrm/templates/settings/site.html:111
+#, fuzzy
+#| msgid "Invite Requests"
+msgid "Invite request text:"
+msgstr "邀請請求"
+
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2450,7 +2784,7 @@ msgid "and %(remainder_count_display)s other"
 msgid_plural "and %(remainder_count_display)s others"
 msgstr[0] ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:61
 msgid "No cover"
 msgstr "沒有封面"
 
@@ -2487,48 +2821,50 @@ msgstr ""
 msgid "Progress:"
 msgstr "進度:"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:34
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30
+#: bookwyrm/templates/snippets/create_status/comment.html:52
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
 msgstr "頁數"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:35
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31
+#: bookwyrm/templates/snippets/create_status/comment.html:58
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:32
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status/comment.html:41
-#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36
+#: bookwyrm/templates/snippets/create_status/comment.html:65
+#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:37
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全書 %(pages)s 頁"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 #: bookwyrm/templates/snippets/status/layout.html:31
 #: bookwyrm/templates/snippets/status/layout.html:49
 #: bookwyrm/templates/snippets/status/layout.html:50
 msgid "Reply"
 msgstr "回覆"
 
-#: bookwyrm/templates/snippets/create_status/content_field.html:16
+#: bookwyrm/templates/snippets/create_status/content_field.html:17
 msgid "Content"
 msgstr "內容"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr "劇透警告:"
-
 #: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning:"
+msgstr "內容"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
 msgid "Spoilers ahead!"
 msgstr "前有劇透！"
 
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:5
+#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
 msgid "Include spoiler alert"
 msgstr "加入劇透警告"
 
-#: bookwyrm/templates/snippets/create_status/layout.html:38
+#: bookwyrm/templates/snippets/create_status/layout.html:41
 #: bookwyrm/templates/snippets/reading_modals/form.html:7
 msgid "Comment:"
 msgstr "評論:"
@@ -2540,27 +2876,45 @@ msgstr "評論:"
 msgid "Private"
 msgstr "私密"
 
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
 msgid "Post"
 msgstr "釋出"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:19
+#: bookwyrm/templates/snippets/create_status/quotation.html:17
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status/quotation.html:27
+#: bookwyrm/templates/snippets/create_status/quotation.html:25
 #, fuzzy, python-format
 #| msgid "Edit \"%(book_title)s\""
 msgid "An excerpt from '%(book_title)s'"
 msgstr "編輯 \"%(book_title)s\""
 
-#: bookwyrm/templates/snippets/create_status/review.html:20
+#: bookwyrm/templates/snippets/create_status/quotation.html:32
+#, fuzzy
+#| msgid "Description:"
+msgid "Position:"
+msgstr "描述:"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:45
+#, fuzzy
+#| msgid "pages"
+msgid "On page:"
+msgstr "頁數"
+
+#: bookwyrm/templates/snippets/create_status/quotation.html:51
+#, fuzzy
+#| msgid "percent"
+msgid "At percent:"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/create_status/review.html:25
 #, fuzzy, python-format
 #| msgid "Editions of %(book_title)s"
 msgid "Your review of '%(book_title)s'"
 msgstr "%(book_title)s 的各版本"
 
-#: bookwyrm/templates/snippets/create_status/review.html:32
+#: bookwyrm/templates/snippets/create_status/review.html:40
 msgid "Review:"
 msgstr "書評:"
 
@@ -2573,13 +2927,13 @@ msgstr "刪除這些閱讀日期嗎？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正要刪除這篇閱讀經過以及與之相關的 %(count)s 次進度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:10
-#: bookwyrm/templates/snippets/fav_button.html:12
+#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
 msgid "Like"
 msgstr "喜歡"
 
-#: bookwyrm/templates/snippets/fav_button.html:18
-#: bookwyrm/templates/snippets/fav_button.html:19
+#: bookwyrm/templates/snippets/fav_button.html:30
+#: bookwyrm/templates/snippets/fav_button.html:31
 msgid "Un-like"
 msgstr "取消喜歡"
 
@@ -2627,12 +2981,20 @@ msgstr "取消關注"
 msgid "Accept"
 msgstr "接受"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:19
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "沒有評價"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/form_rate_stars.html:28
+#, fuzzy, python-format
+#| msgid "%(rating)s star"
+#| msgid_plural "%(rating)s stars"
+msgid "%(half_rating)s star"
+msgid_plural "%(half_rating)s stars"
+msgstr[0] "%(rating)s 星"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:64
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
@@ -2778,7 +3140,7 @@ msgid "(Optional)"
 msgstr ""
 
 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:50
 msgid "Update progress"
 msgstr "更新進度"
 
@@ -2816,37 +3178,59 @@ msgstr "移動書目"
 msgid "More shelves"
 msgstr "更多書架"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24
 msgid "Start reading"
 msgstr "開始閱讀"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:19
-msgid "Finish reading"
-msgstr "完成閱讀"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Want to read"
 msgstr "想要閱讀"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:57
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "從 %(name)s 移除"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:30
+msgid "Finish reading"
+msgstr "完成閱讀"
+
 #: bookwyrm/templates/snippets/status/content_status.html:72
-#: bookwyrm/templates/snippets/trimmed_text.html:17
-msgid "Show more"
-msgstr "顯示更多"
+#, fuzzy
+#| msgid "Content"
+msgid "Content warning"
+msgstr "內容"
 
-#: bookwyrm/templates/snippets/status/content_status.html:87
-#: bookwyrm/templates/snippets/trimmed_text.html:34
-msgid "Show less"
-msgstr "顯示更少"
+#: bookwyrm/templates/snippets/status/content_status.html:79
+#, fuzzy
+#| msgid "Like status"
+msgid "Show status"
+msgstr "喜歡狀態"
 
-#: bookwyrm/templates/snippets/status/content_status.html:117
+#: bookwyrm/templates/snippets/status/content_status.html:101
+#, fuzzy, python-format
+#| msgid "page %(page)s"
+msgid "(Page %(page)s)"
+msgstr "第 %(page)s 頁"
+
+#: bookwyrm/templates/snippets/status/content_status.html:103
+#, fuzzy, python-format
+#| msgid "%(percent)s%% complete!"
+msgid "(%(percent)s%%)"
+msgstr "完成了 %(percent)s%% ！"
+
+#: bookwyrm/templates/snippets/status/content_status.html:125
 msgid "Open image in new window"
 msgstr "在新視窗中開啟圖片"
 
+#: bookwyrm/templates/snippets/status/content_status.html:144
+#, fuzzy
+#| msgid "Like status"
+msgid "Hide status"
+msgstr "喜歡狀態"
+
 #: bookwyrm/templates/snippets/status/headers/comment.html:2
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
@@ -2924,7 +3308,7 @@ msgstr "刪除並重新起草"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:12
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Send direct message"
 msgstr "發送私信"
 
@@ -2959,6 +3343,14 @@ msgstr "升序排序"
 msgid "Sorted descending"
 msgstr "降序排序"
 
+#: bookwyrm/templates/snippets/trimmed_text.html:17
+msgid "Show more"
+msgstr "顯示更多"
+
+#: bookwyrm/templates/snippets/trimmed_text.html:34
+msgid "Show less"
+msgstr "顯示更少"
+
 #: bookwyrm/templates/user/layout.html:18 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "使用者使用者資料"
@@ -3013,38 +3405,49 @@ msgstr "編輯書架"
 msgid "Update shelf"
 msgstr "更新書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有書目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:38
+#: bookwyrm/templates/user/shelf/shelf.html:55
 msgid "Create shelf"
 msgstr "建立書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:62
+#: bookwyrm/templates/user/shelf/shelf.html:76
+#, python-format
+msgid "%(formatted_count)s book"
+msgid_plural "%(formatted_count)s books"
+msgstr[0] ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#, python-format
+msgid "(showing %(start)s-%(end)s)"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:94
 msgid "Edit shelf"
 msgstr "編輯書架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:113
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "Shelved"
 msgstr "上架時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:109
+#: bookwyrm/templates/user/shelf/shelf.html:114
+#: bookwyrm/templates/user/shelf/shelf.html:141
 msgid "Started"
 msgstr "開始時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:83
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Finished"
 msgstr "完成時間"
 
-#: bookwyrm/templates/user/shelf/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:170
 msgid "This shelf is empty."
 msgstr "此書架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:144
+#: bookwyrm/templates/user/shelf/shelf.html:176
 msgid "Delete shelf"
 msgstr "刪除書架"
 
@@ -3102,7 +3505,23 @@ msgstr[0] "%(mutuals_display)s 個你也關注的關注者"
 msgid "No followers you follow"
 msgstr "你關注的關注者"
 
-#: bookwyrm/templates/user_admin/user.html:9
+#: bookwyrm/templates/user_admin/delete_user_form.html:5
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:31
+msgid "Permanently delete user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:12
+#, python-format
+msgid "Are you sure you want to delete <strong>%(username)s</strong>'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion."
+msgstr ""
+
+#: bookwyrm/templates/user_admin/delete_user_form.html:17
+#, fuzzy
+#| msgid "Confirm password:"
+msgid "Your password:"
+msgstr "確認密碼:"
+
+#: bookwyrm/templates/user_admin/user.html:8
 msgid "Back to users"
 msgstr "回到使用者"
 
@@ -3129,31 +3548,83 @@ msgid "Remote instance"
 msgstr "移除伺服器"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:24
 msgid "Active"
 msgstr "活躍"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
+#: bookwyrm/templates/user_admin/user_info.html:28
 msgid "Inactive"
 msgstr "停用"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
-#: bookwyrm/templates/user_admin/user_info.html:49
+#: bookwyrm/templates/user_admin/user_info.html:140
 msgid "Not set"
 msgstr "未設定"
 
-#: bookwyrm/templates/user_admin/user_info.html:5
-msgid "User details"
-msgstr "使用者詳情"
-
-#: bookwyrm/templates/user_admin/user_info.html:14
+#: bookwyrm/templates/user_admin/user_info.html:16
 msgid "View user profile"
 msgstr "檢視使用者資料"
 
-#: bookwyrm/templates/user_admin/user_info.html:20
+#: bookwyrm/templates/user_admin/user_info.html:36
+msgid "Local"
+msgstr "本站"
+
+#: bookwyrm/templates/user_admin/user_info.html:38
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote"
+msgstr "移除"
+
+#: bookwyrm/templates/user_admin/user_info.html:47
+msgid "User details"
+msgstr "使用者詳情"
+
+#: bookwyrm/templates/user_admin/user_info.html:52
+#, fuzzy
+#| msgid "Email"
+msgid "Email:"
+msgstr "郵箱"
+
+#: bookwyrm/templates/user_admin/user_info.html:64
+#, fuzzy
+#| msgid "Directory"
+msgid "(View reports)"
+msgstr "目錄"
+
+#: bookwyrm/templates/user_admin/user_info.html:72
+#, fuzzy
+#| msgid "Blocked by us:"
+msgid "Blocked by count:"
+msgstr "我們所封鎖的:"
+
+#: bookwyrm/templates/user_admin/user_info.html:77
+#, fuzzy
+#| msgid "last active"
+msgid "Last active date:"
+msgstr "最後活躍"
+
+#: bookwyrm/templates/user_admin/user_info.html:82
+#, fuzzy
+#| msgid "Manually approve followers:"
+msgid "Manually approved followers:"
+msgstr "手動批准關注者:"
+
+#: bookwyrm/templates/user_admin/user_info.html:87
+#, fuzzy
+#| msgid "Discard"
+msgid "Discoverable:"
+msgstr "放棄"
+
+#: bookwyrm/templates/user_admin/user_info.html:93
+msgid "Deactivation reason:"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:111
 msgid "Instance details"
 msgstr "實例詳情"
 
-#: bookwyrm/templates/user_admin/user_info.html:46
+#: bookwyrm/templates/user_admin/user_info.html:137
 msgid "View instance"
 msgstr "檢視實例"
 
@@ -3161,35 +3632,35 @@ msgstr "檢視實例"
 msgid "Permanently deleted"
 msgstr ""
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:17
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:20
 msgid "Suspend user"
 msgstr "停用使用者"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:19
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:25
 msgid "Un-suspend user"
 msgstr "取消停用使用者"
 
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:28
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:47
 msgid "Access level:"
 msgstr "訪問權限:"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28
 msgid "File exceeds maximum size: 10MB"
 msgstr "檔案超過了最大大小: 10MB"
 
-#: bookwyrm/templatetags/utilities.py:30
+#: bookwyrm/templatetags/utilities.py:31
 #, python-format
 msgid "%(title)s: %(subtitle)s"
 msgstr ""
 
-#: bookwyrm/views/authentication.py:69
-msgid "Username or password are incorrect"
-msgstr ""
-
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "不是有效的 csv 檔案"
 
+#: bookwyrm/views/login.py:70
+msgid "Username or password are incorrect"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "沒有找到使用該郵箱的使用者。"
@@ -3204,11 +3675,26 @@ msgstr "密碼重置連結已傳送給 %s"
 msgid "Status updates from {obj.display_name}"
 msgstr ""
 
+#~ msgid "This instance is closed"
+#~ msgstr "本實例不開放。"
+
+#~ msgid "Contact an administrator to get an invite"
+#~ msgstr "聯絡管理員以取得邀請"
+
+#~ msgid "Spoiler alert:"
+#~ msgstr "劇透警告:"
+
+#~ msgid "Date federated"
+#~ msgstr "跨站日期"
+
+#~ msgid "Search Results for \"%(query)s\""
+#~ msgstr "\"%(query)s\" 的搜尋結果"
+
+#~ msgid "Matching Books"
+#~ msgstr "匹配的書目"
+
 #~ msgid "Local Timeline"
 #~ msgstr "本地時間線"
 
 #~ msgid "Federated Timeline"
 #~ msgstr "跨站時間線"
-
-#~ msgid "Local"
-#~ msgstr "本站"
diff --git a/nginx/production b/nginx/production
index 54c84af45..3c8b2ea7d 100644
--- a/nginx/production
+++ b/nginx/production
@@ -25,6 +25,12 @@ server {
 #
 #     server_name your-domain.com;
 #
+#     client_max_body_size 3M;
+#
+#     if ($host != "you-domain.com") {
+#         return 301 $scheme://your-domain.com$request_uri;
+#     }
+#
 #     # SSL code
 #     ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
 #     ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
diff --git a/requirements.txt b/requirements.txt
index 37be89440..f01f2bcbd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 celery==4.4.2
 colorthief==0.2.1
-Django==3.2.4
+Django==3.2.5
 django-imagekit==4.0.2
 django-model-utils==4.0.0
 environs==7.2.0
diff --git a/yarn.lock b/yarn.lock
index af20d142d..d25fbfb6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -314,9 +314,9 @@ ansi-colors@^4.1.1:
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.1:
   version "3.2.1"