diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/base.html
index 81b9cd7..e2cc2e4 100644
--- a/nummi/main/templates/main/form/base.html
+++ b/nummi/main/templates/main/form/base.html
@@ -22,6 +22,15 @@
             {% endfor %}
         </tbody>
         <tfoot class="buttons">
+            <tr>
+                <td colspan="2">
+                    <label for="addmore">{% translate "Add another" %}</label>
+                    <input type="checkbox"
+                           name="addmore"
+                           id="addmore"
+                           {% if form.instance.adding %}checked{% endif %} />
+                </td>
+            </tr>
             <tr>
                 <td colspan="2">
                     {% block buttons %}
diff --git a/nummi/main/templates/main/tag/form_buttons.html b/nummi/main/templates/main/tag/form_buttons.html
deleted file mode 100644
index 707ece3..0000000
--- a/nummi/main/templates/main/tag/form_buttons.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-<div class="buttons">
-    {% if not adding %}
-        {% translate "Delete" as del %}
-        <a class="btn del" href="{% url del_url instance.id %}">{{ del }}</a>
-    {% endif %}
-    <input type="reset" />
-    <input type="submit" value="{% translate 'Save' %}" />
-</div>
diff --git a/nummi/main/templatetags/main_extras.py b/nummi/main/templatetags/main_extras.py
index b1b67ff..a0dad28 100644
--- a/nummi/main/templatetags/main_extras.py
+++ b/nummi/main/templatetags/main_extras.py
@@ -33,15 +33,6 @@ def pmrvalue(val):
     return value(val, True, r=0)
 
 
-@register.inclusion_tag("main/tag/form_buttons.html")
-def form_buttons(instance):
-    return {
-        "instance": instance,
-        "adding": instance._state.adding,
-        "del_url": f"del_{instance.__class__.__name__.lower()}",
-    }
-
-
 @register.filter
 def remix(icon):
     return mark_safe(f"""<span class="ri-{icon}-line"></span>""")