diff --git a/nummi/main/forms.py b/nummi/main/forms.py
index d1e5de1..aff90df 100644
--- a/nummi/main/forms.py
+++ b/nummi/main/forms.py
@@ -10,7 +10,7 @@ class NummiFileInput(forms.ClearableFileInput):
 
 
 class NummiForm(forms.ModelForm):
-    template_name = "main/form/base.html"
+    template_name = "main/form/form_base.html"
 
     def __init__(self, *args, user, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/nummi/main/templates/main/form/account.html b/nummi/main/templates/main/form/account.html
index f14da2d..f6c8f7c 100644
--- a/nummi/main/templates/main/form/account.html
+++ b/nummi/main/templates/main/form/account.html
@@ -16,19 +16,25 @@
           type="text/css" />
 {% endblock %}
 {% block body %}
-    <h1>{{ form.instance.icon|remix }}{{ form.instance }}</h1>
-    <form method="post">
-        {% csrf_token %}
-        {{ form }}
-    </form>
-    {% if not form.instance.adding %}
-        <h2>{% translate "Statements" %}</h2>
-        {% include "main/table/snapshot.html" %}
-    {% endif %}
-    {% if transactions %}
-        <h2>{% translate "Transactions" %}</h2>
-        {% include "main/table/transaction.html" %}
-        <h2>{% translate "History" %}</h2>
-        {% include "main/plot/history.html" %}
-    {% endif %}
+    {% with account=form.instance %}
+        {% if account.adding %}
+            <h1>{% translate "New account" %}</h1>
+        {% else %}
+            <h1>{{ account.icon|remix }}{{ account }}</h1>
+        {% endif %}
+        <form method="post">
+            {% csrf_token %}
+            {{ form }}
+        </form>
+        {% if not account.adding %}
+            <h2>{% translate "Statements" %}</h2>
+            {% include "main/table/snapshot.html" %}
+        {% endif %}
+        {% if transactions %}
+            <h2>{% translate "Transactions" %}</h2>
+            {% include "main/table/transaction.html" %}
+            <h2>{% translate "History" %}</h2>
+            {% include "main/plot/history.html" %}
+        {% endif %}
+    {% endwith %}
 {% endblock %}
diff --git a/nummi/main/templates/main/form/category.html b/nummi/main/templates/main/form/category.html
index 27ae5e9..c5dd794 100644
--- a/nummi/main/templates/main/form/category.html
+++ b/nummi/main/templates/main/form/category.html
@@ -16,15 +16,21 @@
           type="text/css" />
 {% endblock %}
 {% block body %}
-    <h1>{{ form.instance.icon|remix }}{{ form.instance }}</h1>
-    <form method="post">
-        {% csrf_token %}
-        {{ form }}
-    </form>
-    {% if form.instance.transactions %}
-        <h2>{% translate "Transactions" %}</h2>
-        {% include "main/table/transaction.html" %}
-        <h2>{% translate "History" %}</h2>
-        {% include "main/plot/history.html" %}
-    {% endif %}
+    {% with category=form.instance %}
+        {% if category.adding %}
+            <h1>{% translate "New category" %}</h1>
+        {% else %}
+            <h1>{{ category.icon|remix }}{{ category }}</h1>
+        {% endif %}
+        <form method="post">
+            {% csrf_token %}
+            {{ form }}
+        </form>
+        {% if category.transactions %}
+            <h2>{% translate "Transactions" %}</h2>
+            {% include "main/table/transaction.html" %}
+            <h2>{% translate "History" %}</h2>
+            {% include "main/plot/history.html" %}
+        {% endif %}
+    {% endwith %}
 {% endblock %}
diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/form_base.html
similarity index 100%
rename from nummi/main/templates/main/form/base.html
rename to nummi/main/templates/main/form/form_base.html
diff --git a/nummi/main/templates/main/form/invoice.html b/nummi/main/templates/main/form/invoice.html
index 26c9dd1..95afb16 100644
--- a/nummi/main/templates/main/form/invoice.html
+++ b/nummi/main/templates/main/form/invoice.html
@@ -14,7 +14,11 @@
 {% endblock %}
 {% block body %}
     {% with invoice=form.instance %}
-        <h1>{{ invoice }}</h1>
+        {% if invoice.adding %}
+            <h1>{% translate "New invoice" %}</h1>
+        {% else %}
+            <h1>{{ invoice }}</h1>
+        {% endif %}
         <p>
             <a href="{{ invoice.transaction.get_absolute_url }}">{{ invoice.transaction }}</a>
         </p>
diff --git a/nummi/main/templates/main/form/login.html b/nummi/main/templates/main/form/login.html
index 841e941..8a74bc7 100644
--- a/nummi/main/templates/main/form/login.html
+++ b/nummi/main/templates/main/form/login.html
@@ -1,4 +1,4 @@
-{% extends "main/form/base.html" %}
+{% extends "main/form/form_base.html" %}
 {% load i18n %}
 {% block buttons %}
     <input hidden value="{{ next }}" name="next" />
diff --git a/nummi/main/templates/main/form/search.html b/nummi/main/templates/main/form/search.html
index 58d3a2f..af7b012 100644
--- a/nummi/main/templates/main/form/search.html
+++ b/nummi/main/templates/main/form/search.html
@@ -1,4 +1,4 @@
-{% extends "main/form/base.html" %}
+{% extends "main/form/form_base.html" %}
 {% load i18n %}
 {% block buttons %}
     <input type="reset" />
diff --git a/nummi/main/templates/main/form/snapshot.html b/nummi/main/templates/main/form/snapshot.html
index 78ebae8..54c7c18 100644
--- a/nummi/main/templates/main/form/snapshot.html
+++ b/nummi/main/templates/main/form/snapshot.html
@@ -17,10 +17,14 @@
 {% endblock %}
 {% block body %}
     {% with snapshot=form.instance %}
-        <h1>
-            <span class="ri-{% if snapshot.sum == snapshot.diff %}check-line green{% else %}close-line red{% endif %}"></span>
-            {{ snapshot }}
-        </h1>
+        {% if snapshot.adding %}
+            <h1>{% translate "New snapshot" %}</h1>
+        {% else %}
+            <h1>
+                <span class="ri-{% if snapshot.sum == snapshot.diff %}check-line green{% else %}close-line red{% endif %}"></span>
+                {{ snapshot }}
+            </h1>
+        {% endif %}
         <form method="post" enctype="multipart/form-data">
             {% csrf_token %}
             {{ form }}
diff --git a/nummi/main/templates/main/form/transaction.html b/nummi/main/templates/main/form/transaction.html
index 9813d40..c70a855 100644
--- a/nummi/main/templates/main/form/transaction.html
+++ b/nummi/main/templates/main/form/transaction.html
@@ -13,15 +13,21 @@
           type="text/css" />
 {% endblock %}
 {% block body %}
-    <h1>{{ form.instance }}</h1>
-    {% spaceless %}
-        <form id="transaction" method="post">
-            {% csrf_token %}
-            {{ form }}
-        </form>
-    {% endspaceless %}
-    {% if not form.instance.adding %}
-        <h2>{% translate "Invoices" %}</h2>
-        {% include "main/table/invoice.html" %}
-    {% endif %}
+    {% with transaction=form.instance %}
+        {% if transaction.adding %}
+            <h1>{% translate "New transaction" %}</h1>
+        {% else %}
+            <h1>{{ form.instance }}</h1>
+        {% endif %}
+        {% spaceless %}
+            <form id="transaction" method="post">
+                {% csrf_token %}
+                {{ form }}
+            </form>
+        {% endspaceless %}
+        {% if not form.instance.adding %}
+            <h2>{% translate "Invoices" %}</h2>
+            {% include "main/table/invoice.html" %}
+        {% endif %}
+    {% endwith %}
 {% endblock %}