diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 04e7f014..3e3e8bf4 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,13 @@
{% endfor %}
- {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %}
+
+ {% if list.description %}
+ {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+ {% else %}
+
+ {% endif %}
+
{% include 'lists/created_text.html' with list=list %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index f7ab020a..a9258305 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,17 +1,19 @@
{% extends 'layout.html' %}
+{% load bookwyrm_tags %}
{% load i18n %}
{% block title %}{% trans "Lists" %}{% endblock %}
{% block content %}
-
-{% if request.user.is_authenticated and not lists.has_previous %}
-
{% trans "Your lists" %}
+
+ {% trans "Lists" %}
+ {% if request.user.is_authenticated %}
+ Your lists
+ {% endif %}
+
{% trans "Create List" as button_text %}
@@ -23,23 +25,11 @@
{% include 'lists/create_form.html' with controls_text="create-list" %}
-
- {% if request.user.list_set.exists %}
- {% include 'lists/list_items.html' with lists=request.user.list_set.all|slice:4 %}
- {% endif %}
-
- {% if request.user.list_set.count > 4 %}
- {% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %}
- {% endif %}
-
-{% endif %}
-
-
{% if lists %}
- {% trans "Recent Lists" %}
{% include 'lists/list_items.html' with lists=lists %}
+
{% include 'snippets/pagination.html' with page=lists path=path %}
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 91475d48..5c88e189 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -27,17 +27,13 @@ class Lists(View):
except ValueError:
page = 1
- user = request.user if request.user.is_authenticated else None
# hide lists with no approved books
- lists = (
- models.List.objects.filter(
- ~Q(user=user),
- )
- .annotate(item_count=Count("listitem", filter=Q(listitem__approved=True)))
- .filter(item_count__gt=0)
- .distinct()
- .all()
- )
+ lists = models.List.objects.annotate(
+ item_count=Count("listitem", filter=Q(listitem__approved=True))
+ ).filter(
+ item_count__gt=0
+ ).distinct().all()
+
lists = privacy_filter(
request.user, lists, privacy_levels=["public", "followers"]
)