diff --git a/bookwyrm/templates/groups/delete_group_modal.html b/bookwyrm/templates/groups/delete_group_modal.html
index 4bb87ed9..15eea60f 100644
--- a/bookwyrm/templates/groups/delete_group_modal.html
+++ b/bookwyrm/templates/groups/delete_group_modal.html
@@ -1,4 +1,4 @@
-{% extends 'components/modal.html' %}
+{% extends 'components/new_modal.html' %}
 {% load i18n %}
 
 {% block modal-title %}{% trans "Delete this group?" %}{% endblock %}
@@ -14,8 +14,7 @@
     <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_group" controls_uid=group.id %}
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/groups/edit_form.html b/bookwyrm/templates/groups/edit_form.html
index 1c58dc77..a83ad9fb 100644
--- a/bookwyrm/templates/groups/edit_form.html
+++ b/bookwyrm/templates/groups/edit_form.html
@@ -9,5 +9,5 @@
 <form name="edit-group" method="post" action="{% url 'group' group.id %}">
     {% include 'groups/form.html' %}
 </form>
-{% include "groups/delete_group_modal.html" with controls_text="delete_group" controls_uid=group.id %}
+{% include "groups/delete_group_modal.html" with id="delete_group" %}
 {% endblock %}
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index 21c525ee..2b3dd635 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -14,21 +14,20 @@
         </div>
     </div>
 </div>
-<div class="columns is-mobile">
-    <div class="column">
-        <div class="field has-addons">
-            <div class="control">
-                {% include 'snippets/privacy_select_no_followers.html' with current=group.privacy %}
-            </div>
-            <div class="control">
-                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
-            </div>
-        </div>
-    </div>
+<div class="is-flex">
     {% if group.id %}
-    <div class="column is-narrow">
-        {% trans "Delete group" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class="is-danger" text=button_text icon_with_text="x" controls_text="delete_group" controls_uid=group.id focus="modal_title_delete_group" %}
+    <div class="is-flex-grow-1">
+        <button type="button" data-modal-open="delete_group" class="button is-danger">
+            {% trans "Delete group" %}
+        </button>
     </div>
     {% endif %}
+    <div class="field has-addons">
+        <div class="control">
+            {% include 'snippets/privacy_select_no_followers.html' with current=group.privacy %}
+        </div>
+        <div class="control">
+            <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+        </div>
+    </div>
 </div>