diff --git a/bookwyrm/templates/groups/group.html b/bookwyrm/templates/groups/group.html
index 4fea5a84..abb24143 100644
--- a/bookwyrm/templates/groups/group.html
+++ b/bookwyrm/templates/groups/group.html
@@ -11,15 +11,13 @@
         {% include "groups/members.html" %}
 
         <h2 class="heading">Lists</h2>
-        {% if not group.lists.exists %}
+        {% if not lists %}
         <p>{% trans "This group has no lists" %}</p>
         {% else %}
-        <ul start="{{ lists.start_index }}" class="ordered-list">
-        {% for list in group.lists.all %}
-            <li class="block mb-5">
+
               <div class="columns is-multiline">
                 {% for list in lists %}
-                <div class="column is-one-quarter">
+                <div class="column is-one-third">
                     <div class="card is-stretchable">
                         <header class="card-header">
                             <h4 class="card-header-title">
@@ -55,9 +53,8 @@
                 </div>
                 {% endfor %}
             </div>
-            </li>
-        {% endfor %}
-        </ul>
+
+
         {% endif %}
         {% include "snippets/pagination.html" with page=items %}
     </section>
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index 9a000d3f..0019520e 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% csrf_token %}
+{% load utilities %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
@@ -31,6 +32,35 @@
                 <input type="radio" name="curation" value="open"{% if list.curation == 'open' %} checked{% endif %}> {% trans "Open" %}
                 <p class="help mb-2">{% trans "Anyone can add books to this list" %}</p>
             </label>
+
+            <label class="field">
+              <input type="radio" name="curation" value="group"{% if list.curation == 'group' %} checked{% endif %}> {% trans "Group" %}
+              <p class="help mb-2">{% trans "Group members can add to and remove from this list" %}</p>
+          </label>
+
+          <!-- TODO: add a list picker on-select for group lists -->
+
+          <!-- TODO: change the submission url -->
+          <!-- <form name="list-add" method="post" action="{% url 'list-add-book' %}"> -->
+            {% if user_groups %}
+              {% csrf_token %}
+              <label class="label" for="id_group">{% trans "Select Group" %}</label>
+              <div class="field has-addons">
+                  <div class="select control">
+                      <select name="group" id="id_group">
+                          <option value="{{ group.id }}" disabled selected></option>
+                          {% for group in user_groups %}
+                          <option value="{{ group.id }}">{{ group.name }}</option>
+                          {% endfor %}
+                      </select>
+                  </div>
+              </div>
+              {% else %}
+              {% with user|username as username %}
+              {% url 'user-groups' user|username as url %}
+              <div>{% trans "You must create a " %}<a href="{{ url }}">{% trans "Group" %}</a>{% trans " before you can create Group lists!" %}</div>
+              {% endwith %}
+              {% endif %}
         </fieldset>
     </div>
 </div>
diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html
index 68abafc0..914478ab 100644
--- a/bookwyrm/templates/lists/layout.html
+++ b/bookwyrm/templates/lists/layout.html
@@ -25,7 +25,7 @@
 </div>
 
 <div class="block">
-    {% include 'lists/edit_form.html' with controls_text="edit_list" %}
+    {% include 'lists/edit_form.html' with controls_text="edit_list" user_groups=user_groups %}
 </div>
 
 {% block panel %}{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 22b8e2ce..357ad467 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -75,6 +75,7 @@
             <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
+        <!-- TODO: fix this: user.groups_set isn't what you think! -->
         {% if is_self or user.groups_set.exists %}
         {% url 'user-groups' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>