diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo
index fc30c45..c753bf0 100644
Binary files a/nummi/main/locale/fr/LC_MESSAGES/django.mo and b/nummi/main/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.po b/nummi/main/locale/fr/LC_MESSAGES/django.po
index 71dbd28..64b2199 100644
--- a/nummi/main/locale/fr/LC_MESSAGES/django.po
+++ b/nummi/main/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-20 12:05+0200\n"
+"POT-Creation-Date: 2023-04-20 12:13+0200\n"
 "PO-Revision-Date: 2022-12-21 17:30+0100\n"
 "Last-Translator: edpibu <git@edgarpierre.fr>\n"
 "Language-Team: edpibu <git@edgarpierre.fr>\n"
@@ -66,7 +66,7 @@ msgstr "Catégorie"
 msgid "Budget"
 msgstr "Budget"
 
-#: .\models.py:121 .\templates\main\form\snapshot.html:10
+#: .\models.py:121 .\templates\main\form\snapshot.html:16
 #: .\templates\main\index.html:32
 msgid "Categories"
 msgstr "Catégories"
@@ -110,7 +110,7 @@ msgstr "Relevé du %(date)s"
 msgid "Statement"
 msgstr "Relevé"
 
-#: .\models.py:204 .\templates\main\form\account.html:7
+#: .\models.py:204 .\templates\main\form\account.html:13
 #: .\templates\main\list\snapshot.html:6 .\templates\main\list\snapshot.html:20
 msgid "Statements"
 msgstr "Relevés"
@@ -146,8 +146,8 @@ msgid "Payment"
 msgstr "Paiement"
 
 #: .\models.py:277 .\templates\main\base.html:50
-#: .\templates\main\form\account.html:11 .\templates\main\form\category.html:7
-#: .\templates\main\form\snapshot.html:14 .\templates\main\index.html:26
+#: .\templates\main\form\account.html:17 .\templates\main\form\category.html:13
+#: .\templates\main\form\snapshot.html:20 .\templates\main\index.html:26
 #: .\templates\main\list\transaction.html:6
 #: .\templates\main\list\transaction.html:23
 #: .\templates\main\table\snapshot.html:28
@@ -158,7 +158,7 @@ msgstr "Transactions"
 msgid "Invoice"
 msgstr "Facture"
 
-#: .\models.py:324 .\templates\main\form\transaction.html:5
+#: .\models.py:324 .\templates\main\form\transaction.html:11
 msgid "Invoices"
 msgstr "Factures"
 
@@ -174,21 +174,21 @@ msgstr "Accueil"
 msgid "Snapshots"
 msgstr "Relevés"
 
-#: .\templates\main\base.html:56
-msgid "Create Account"
-msgstr "Créer Compte"
+#: .\templates\main\base.html:56 .\templates\main\form\account.html:5
+msgid "Create account"
+msgstr "Créer un compte"
 
-#: .\templates\main\base.html:61
-msgid "Create Snapshot"
-msgstr "Créer Relevé"
+#: .\templates\main\base.html:61 .\templates\main\form\snapshot.html:5
+msgid "Create snapshot"
+msgstr "Créer un relevé"
 
-#: .\templates\main\base.html:66
-msgid "Create Category"
-msgstr "Créer Catégorie"
+#: .\templates\main\base.html:66 .\templates\main\form\category.html:5
+msgid "Create category"
+msgstr "Créer une catégorie"
 
-#: .\templates\main\base.html:71
-msgid "Create Transaction"
-msgstr "Créer Transaction"
+#: .\templates\main\base.html:71 .\templates\main\form\transaction.html:4
+msgid "Create transaction"
+msgstr "Créer une transaction"
 
 #: .\templates\main\base.html:79
 msgid "Log out"
@@ -211,15 +211,18 @@ msgstr "Annuler"
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: .\templates\main\form\account.html:13 .\templates\main\form\category.html:9
+#: .\templates\main\form\account.html:8
+msgid "New account"
+msgstr "Nouveau compte"
+
+#: .\templates\main\form\account.html:19 .\templates\main\form\category.html:15
 #: .\templates\main\index.html:28
 msgid "History"
 msgstr "Historique"
 
-#: .\templates\main\form\base.html:7 .\templates\main\form\base.html:28
-#, python-format
-msgid "Create %(name)s"
-msgstr "Créer %(name)s"
+#: .\templates\main\form\category.html:8
+msgid "New category"
+msgstr "Nouvelle catégorie"
 
 #: .\templates\main\form\form_base.html:29
 #: .\templates\main\table\invoice.html:11
@@ -239,6 +242,23 @@ msgstr "Créer"
 msgid "Save"
 msgstr "Enregistrer"
 
+#: .\templates\main\form\invoice.html:3
+msgid "Create invoice"
+msgstr "Créer une facture"
+
+#: .\templates\main\form\invoice.html:6 .\templates\main\table\invoice.html:37
+msgid "New invoice"
+msgstr "Nouvelle facture"
+
+#: .\templates\main\form\snapshot.html:8
+msgid "New snapshot"
+msgstr "Nouveau relevés"
+
+#: .\templates\main\form\transaction.html:7
+#: .\templates\main\table\transaction.html:5
+msgid "New transaction"
+msgstr "Nouvelle transaction"
+
 #: .\templates\main\list\snapshot.html:27
 msgid "No snapshots to show"
 msgstr "Aucun relevé à afficher"
@@ -267,10 +287,6 @@ msgstr "Mois"
 msgid "No invoice"
 msgstr "Aucune facture"
 
-#: .\templates\main\table\invoice.html:37
-msgid "New invoice"
-msgstr "Nouvelle facture"
-
 #: .\templates\main\table\snapshot.html:5
 msgid "New statement"
 msgstr "Nouveau relevé"
@@ -279,10 +295,22 @@ msgstr "Nouveau relevé"
 msgid "View all statements"
 msgstr "Voir tous les relevés"
 
-#: .\templates\main\table\transaction.html:5
-msgid "New transaction"
-msgstr "Nouvelle transaction"
-
 #: .\templates\main\table\transaction.html:73
 msgid "View all transactions"
 msgstr "Voir toutes les transactions"
+
+#~ msgid "Create Account"
+#~ msgstr "Créer Compte"
+
+#~ msgid "Create Snapshot"
+#~ msgstr "Créer Relevé"
+
+#~ msgid "Create Category"
+#~ msgstr "Créer Catégorie"
+
+#~ msgid "Create Transaction"
+#~ msgstr "Créer Transaction"
+
+#, python-format
+#~ msgid "Create %(name)s"
+#~ msgstr "Créer %(name)s"
diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html
index c40f32b..9eb489c 100644
--- a/nummi/main/templates/main/base.html
+++ b/nummi/main/templates/main/base.html
@@ -53,22 +53,22 @@
                             <li>
                                 <a href="{% url 'account' %}"
                                    class="{% if request.resolver_match.url_name == 'account' %}cur{% endif %}"
-                                   accesskey="a">{% translate "Create Account" %}</a>
+                                   accesskey="a">{% translate "Create account" %}</a>
                             </li>
                             <li>
                                 <a href="{% url 'snapshot' %}"
                                    class="{% if request.resolver_match.url_name == 'snapshot' %}cur{% endif %}"
-                                   accesskey="s">{% translate "Create Snapshot" %}</a>
+                                   accesskey="s">{% translate "Create snapshot" %}</a>
                             </li>
                             <li>
                                 <a href="{% url 'category' %}"
                                    class="{% if request.resolver_match.url_name == 'category' %}cur{% endif %}"
-                                   accesskey="c">{% translate "Create Category" %}</a>
+                                   accesskey="c">{% translate "Create category" %}</a>
                             </li>
                             <li>
                                 <a href="{% url 'transaction' %}"
                                    class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}"
-                                   accesskey="t">{% translate "Create Transaction" %}</a>
+                                   accesskey="t">{% translate "Create transaction" %}</a>
                             </li>
                             <li>
                                 <a href="{% url 'search' %}"
diff --git a/nummi/main/templates/main/form/account.html b/nummi/main/templates/main/form/account.html
index a083456..4853452 100644
--- a/nummi/main/templates/main/form/account.html
+++ b/nummi/main/templates/main/form/account.html
@@ -1,6 +1,12 @@
 {% extends "main/form/base.html" %}
 {% load main_extras %}
 {% load i18n %}
+{% block title_new %}
+    {% translate "Create account" %}
+{% endblock %}
+{% block h1_new %}
+    {% translate "New account" %}
+{% endblock %}
 {% block h1 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
 {% block tables %}
     {% if not form.instance.adding %}
diff --git a/nummi/main/templates/main/form/base.html b/nummi/main/templates/main/form/base.html
index 1a6fd93..462f429 100644
--- a/nummi/main/templates/main/form/base.html
+++ b/nummi/main/templates/main/form/base.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% block title %}
     {% if form.instance.adding %}
-        {% blocktranslate with name=form.instance|verbose_name %}Create {{ name }}{% endblocktranslate %}
+        {% block title_new %}{% endblock %}
     {% else %}
         {{ form.instance }}
     {% endif %}
@@ -25,7 +25,9 @@
 {% block body %}
     {% with instance=form.instance %}
         {% if instance.adding %}
-            <h1>{% blocktranslate with name=instance|verbose_name %}Create {{ name }}{% endblocktranslate %}</h1>
+            <h1>
+                {% block h1_new %}{% endblock %}
+            </h1>
         {% else %}
             <h1>
                 {% block h1 %}{{ instance }}{% endblock %}
diff --git a/nummi/main/templates/main/form/category.html b/nummi/main/templates/main/form/category.html
index b07b45e..5dea5c2 100644
--- a/nummi/main/templates/main/form/category.html
+++ b/nummi/main/templates/main/form/category.html
@@ -1,6 +1,12 @@
 {% extends "main/form/base.html" %}
 {% load main_extras %}
 {% load i18n %}
+{% block title_new %}
+    {% translate "Create category" %}
+{% endblock %}
+{% block h1_new %}
+    {% translate "New category" %}
+{% endblock %}
 {% block h1 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
 {% block tables %}
     {% if form.instance.transactions %}
diff --git a/nummi/main/templates/main/form/invoice.html b/nummi/main/templates/main/form/invoice.html
index 53171dc..5b3b473 100644
--- a/nummi/main/templates/main/form/invoice.html
+++ b/nummi/main/templates/main/form/invoice.html
@@ -1 +1,7 @@
 {% extends "main/form/base.html" %}
+{% block title_new %}
+    {% translate "Create invoice" %}
+{% endblock %}
+{% block h1_new %}
+    {% translate "New invoice" %}
+{% endblock %}
diff --git a/nummi/main/templates/main/form/snapshot.html b/nummi/main/templates/main/form/snapshot.html
index 31e639a..aa8aec2 100644
--- a/nummi/main/templates/main/form/snapshot.html
+++ b/nummi/main/templates/main/form/snapshot.html
@@ -1,6 +1,12 @@
 {% extends "main/form/base.html" %}
 {% load main_extras %}
 {% load i18n %}
+{% block title_new %}
+    {% translate "Create snapshot" %}
+{% endblock %}
+{% block h1_new %}
+    {% translate "New snapshot" %}
+{% endblock %}
 {% block h1 %}
     {{ form.instance.sum|check:form.instance.diff }}
     {{ form.instance }}
diff --git a/nummi/main/templates/main/form/transaction.html b/nummi/main/templates/main/form/transaction.html
index 77d19b2..81e648b 100644
--- a/nummi/main/templates/main/form/transaction.html
+++ b/nummi/main/templates/main/form/transaction.html
@@ -1,5 +1,11 @@
 {% extends "main/form/base.html" %}
 {% load i18n %}
+{% block title_new %}
+    {% translate "Create transaction" %}
+{% endblock %}
+{% block h1_new %}
+    {% translate "New transaction" %}
+{% endblock %}
 {% block tables %}
     {% if not form.instance.adding %}
         <h2>{% translate "Invoices" %}</h2>