diff --git a/bookwyrm/templates/groups/layout.html b/bookwyrm/templates/groups/layout.html
index 619c89ee..99c69f1c 100644
--- a/bookwyrm/templates/groups/layout.html
+++ b/bookwyrm/templates/groups/layout.html
@@ -1,5 +1,6 @@
{% extends 'layout.html' %}
{% load i18n %}
+{% load bookwyrm_group_tags %}
{% block title %}{{ group.name }}{% endblock %}
@@ -11,27 +12,30 @@
{% include 'groups/created_text.html' with group=group %}
- {% if request.user == group.user %}
+ {% if group|is_member:request.user %}
{% trans "Create List" as button_text %}
{% include 'snippets/toggle/open_button.html' with controls_text="create_list" icon_with_text="plus" text=button_text focus="create_list_header" %}
+ {% endif %}
+ {% if request.user == group.user %}
{% trans "Edit group" as button_text %}
{% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_group" focus="edit_group_header" %}
{% endif %}
+
+
+ {% include 'snippets/trimmed_text.html' with full=group.description %}
+
+
{% if request.user.is_authenticated %}
{% include 'lists/create_form.html' with controls_text="create_list" curation_group=group %}
{% endif %}
-
- {% include 'snippets/trimmed_text.html' with full=group.description %}
-
-
{% include 'groups/edit_form.html' with controls_text="edit_group" %}