diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/base.html
index e2cc2e4..d4c9652 100644
--- a/nummi/main/templates/main/form/base.html
+++ b/nummi/main/templates/main/form/base.html
@@ -21,27 +21,27 @@
                 </tr>
             {% 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 %}
+        <tfoot>
+            {% block 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 class="buttons">
+                    <td colspan="2">
                         {% if not form.instance.adding %}
                             <a class="del" href="{{ form.instance.get_delete_url }}">{% translate "Delete" %}</a>
                         {% endif %}
                         <input type="reset" value="{% translate "Reset" %}" />
                         <input type="submit" value="{% translate "Save" %}" />
-                    {% endblock %}
-                </td>
-            </tr>
+                    </td>
+                </tr>
+            {% endblock %}
         </tfoot>
     </table>
 {% endblock %}
diff --git a/nummi/main/templates/main/form/login.html b/nummi/main/templates/main/form/login.html
index 1dcd88e..4e344c7 100644
--- a/nummi/main/templates/main/form/login.html
+++ b/nummi/main/templates/main/form/login.html
@@ -1,9 +1,11 @@
 {% extends "main/form/base.html" %}
 {% load i18n %}
 {% block buttons %}
-    <div class="buttons">
-        <input hidden value="{{ next }}" name="next" />
-        <input type="reset" />
-        <input type="submit" value="{% translate "Log in" %}" />
-    </div>
+    <tr class="buttons">
+        <td colspan="2">
+            <input hidden value="{{ next }}" name="next" />
+            <input type="reset" />
+            <input type="submit" value="{% translate "Log in" %}" />
+        </td>
+    </tr>
 {% endblock %}
diff --git a/nummi/main/templates/main/form/search.html b/nummi/main/templates/main/form/search.html
index 6b71216..ffb1775 100644
--- a/nummi/main/templates/main/form/search.html
+++ b/nummi/main/templates/main/form/search.html
@@ -1,7 +1,10 @@
 {% extends "main/form/base.html" %}
 {% load i18n %}
 {% block buttons %}
-    <div class="buttons">
-        <input type="submit" value="{% translate "Search" %}" />
-    </div>
+    <tr class="buttons">
+        <td colspan="2">
+            <input type="reset" />
+            <input type="submit" value="{% translate "Search" %}" />
+        </td>
+    </tr>
 {% endblock %}