diff --git a/backend/templates/ask_reset_password.html b/backend/templates/ask_reset_password.html
index a9655ff..66db225 100644
--- a/backend/templates/ask_reset_password.html
+++ b/backend/templates/ask_reset_password.html
@@ -7,10 +7,10 @@
             <label for="email_field">{{ tr.t(Sentence::EmailAddress) }}</label>
             <input id="email_field" type="email"
                 name="email" value="{{ email }}"
-                autocapitalize="none" autocomplete="email" autofocus="autofocus" />
+                autocapitalize="none" autocomplete="email" autofocus="autofocus">
             {{ message_email }}
 
-            <input type="submit" name="commit" value="{{ tr.t(Sentence::AskResetButton) }}" />
+            <input type="submit" name="commit" value="{{ tr.t(Sentence::AskResetButton) }}">
         </form>
         {{ message }}
     </div>
diff --git a/backend/templates/base.html b/backend/templates/base.html
index 8b24282..c7cbb86 100644
--- a/backend/templates/base.html
+++ b/backend/templates/base.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="{{ tr.current_lang_and_territory_code() }}" data-user-logged="{{ user.is_some() }}" >
     <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Recettes de cuisine</title>
-        <link rel="stylesheet" type="text/css" href="/static/style.css" />
+        <link rel="stylesheet" type="text/css" href="/static/style.css">
     </head>
 
     <body>
@@ -20,8 +20,8 @@
 
         <dialog id="modal-dialog">
             <div class="content"></div>
-            <input type="button" class="ok" value="OK" />
-            <input type="button" class="cancel" value="Cancel" />
+            <input type="button" class="ok" value="OK">
+            <input type="button" class="cancel" value="Cancel">
         </dialog>
 
         {% block body_container %}{% endblock %}
diff --git a/backend/templates/base_with_header.html b/backend/templates/base_with_header.html
index a38b303..d0d843d 100644
--- a/backend/templates/base_with_header.html
+++ b/backend/templates/base_with_header.html
@@ -14,7 +14,7 @@
                     {% else %}
                         {{ user.name }}
                     {% endif %}
-                </a> / <a href="/signout" />{{ tr.t(Sentence::SignOut) }}</a>
+                </a> / <a href="/signout">{{ tr.t(Sentence::SignOut) }}</a>
             {% when None %}
                 <a href="/signin" >{{ tr.t(Sentence::SignInMenu) }}</a>/<a href="/signup">{{ tr.t(Sentence::SignUpMenu) }}</a>/<a href="/ask_reset_password">{{ tr.t(Sentence::LostPassword) }}</a>
             {% endmatch %}
diff --git a/backend/templates/calendar.html b/backend/templates/calendar.html
index d6a10b3..ba29d95 100644
--- a/backend/templates/calendar.html
+++ b/backend/templates/calendar.html
@@ -34,6 +34,7 @@
         ] %}
             <li class="weekday">{{ tr.t(*day) }}</li>
         {% endfor %}
+    </ul>
 
     <ul class="days">
         {% for i in 0..5 %}
@@ -56,7 +57,7 @@
                 id="input-remove-ingredients-from-shopping-list"
                 type="checkbox"
                 checked
-            />
+            >
             <label for="input-remove-ingredients-from-shopping-list">
                 {{ tr.t(Sentence::CalendarRemoveIngredientsFromShoppingList) }}
             </label>
diff --git a/backend/templates/home.html b/backend/templates/home.html
index 426c9e3..e93a1bf 100644
--- a/backend/templates/home.html
+++ b/backend/templates/home.html
@@ -14,7 +14,7 @@
 
 <div id="hidden-templates">
     <div class="shopping-item">
-        <input class="item-is-checked" type="checkbox"/>
+        <input class="item-is-checked" type="checkbox">
         <div class="item-quantity"></div>
         <div class="item-name"></div>
         <div class="item-scheduled-recipe"><a></a></div>
diff --git a/backend/templates/profile.html b/backend/templates/profile.html
index 8bc7ec9..766553f 100644
--- a/backend/templates/profile.html
+++ b/backend/templates/profile.html
@@ -17,12 +17,12 @@
             value="{{ username }}"
             autocapitalize="none"
             autocomplete="title"
-            autofocus="autofocus" />
+            autofocus="autofocus">
 
         <label for="input-email">{{ tr.t(Sentence::ProfileEmail) }}</label>
         <input id="input-email" type="email"
             name="email" value="{{ email }}"
-            autocapitalize="none" autocomplete="email" autofocus="autofocus" />
+            autocapitalize="none" autocomplete="email" autofocus="autofocus">
 
         {{ message_email }}
 
@@ -32,17 +32,17 @@
             type="number"
             step="1" min="1" max="100"
             name="default_servings"
-            value="{{ default_servings }}"/>
+            value="{{ default_servings }}">
 
         <label for="input-password-1">{{ tr.tp(Sentence::ProfileNewPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}</label>
-        <input id="input-password-1" type="password" name="password_1" autocomplete="new-password" />
+        <input id="input-password-1" type="password" name="password_1" autocomplete="new-password">
 
         <label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label>
-        <input id="input-password-2" type="password" name="password_2" autocomplete="new-password" />
+        <input id="input-password-2" type="password" name="password_2" autocomplete="new-password">
 
         {{ message_password }}
 
-        <input type="submit" name="commit" value="{{ tr.t(Sentence::Save) }}" />
+        <input type="submit" name="commit" value="{{ tr.t(Sentence::Save) }}">
     </form>
     {{ message }}
 </div>
diff --git a/backend/templates/recipe_edit.html b/backend/templates/recipe_edit.html
index 5648a04..21f609b 100644
--- a/backend/templates/recipe_edit.html
+++ b/backend/templates/recipe_edit.html
@@ -14,7 +14,7 @@
         id="input-title"
         type="text"
         value="{{ recipe.title }}"
-        autofocus="true" />
+        autofocus="true">
 
     <label for="text-area-description">{{ tr.t(Sentence::RecipeDescription) }}</label>
     <textarea
@@ -28,7 +28,7 @@
         value="
             {% if let Some(s) = recipe.servings %}
                 {{ s }}
-            {% endif %}"/>
+            {% endif %}">
 
     <label for="input-estimated-time">{{ tr.t(Sentence::RecipeEstimatedTime) }}</label>
     <input
@@ -38,7 +38,7 @@
         value="
             {% if let Some(t) = recipe.estimated_time %}
                 {{ t }}
-            {% endif %}"/>
+            {% endif %}">
 
     <label for="select-difficulty">{{ tr.t(Sentence::RecipeDifficulty) }}</label>
     <select id="select-difficulty">
@@ -54,7 +54,7 @@
         <input
             id="input-tags"
             type="text"
-            value="" />
+            value="">
     </div>
 
     <label for="select-language">{{ tr.t(Sentence::RecipeLanguage) }}</label>
@@ -74,15 +74,15 @@
         {%+ if recipe.is_published %}
             checked
         {% endif %}
-    />
+    >
     <label for="input-is-published">{{ tr.t(Sentence::RecipeIsPublished) }}</label>
 
-    <input id="input-delete" type="button" value="{{ tr.t(Sentence::RecipeDelete) }}" />
+    <input id="input-delete" type="button" value="{{ tr.t(Sentence::RecipeDelete) }}">
 
     <div id="groups-container">
     </div>
 
-    <input id="input-add-group" type="button" value="{{ tr.t(Sentence::RecipeAddAGroup) }}" />
+    <input id="input-add-group" type="button" value="{{ tr.t(Sentence::RecipeAddAGroup) }}">
 </div>
 
 <div id="hidden-templates">
@@ -90,17 +90,17 @@
         <span class="drag-handle"></span>
 
         <label for="input-group-name">{{ tr.t(Sentence::RecipeGroupName) }}</label>
-        <input class="input-group-name" type="text" />
+        <input class="input-group-name" type="text">
 
         <label for="input-group-comment">{{ tr.t(Sentence::RecipeGroupComment) }}</label>
-        <input class="input-group-comment" type="text" />
+        <input class="input-group-comment" type="text">
 
-        <input class="input-group-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveGroup) }}" />
+        <input class="input-group-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveGroup) }}">
 
         <div class="steps">
         </div>
 
-        <input class="input-add-step" type="button" value="{{ tr.t(Sentence::RecipeAddAStep) }}" />
+        <input class="input-add-step" type="button" value="{{ tr.t(Sentence::RecipeAddAStep) }}">
     </div>
 
     <div class="step">
@@ -109,29 +109,29 @@
         <label for="text-area-step-action">{{ tr.t(Sentence::RecipeStepAction) }}</label>
         <textarea class="text-area-step-action"></textarea>
 
-        <input class="input-step-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveStep) }}" />
+        <input class="input-step-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveStep) }}">
 
         <div class="ingredients"></div>
 
-        <input class="input-add-ingredient" type="button" value="{{ tr.t(Sentence::RecipeAddAnIngredient) }}"/>
+        <input class="input-add-ingredient" type="button" value="{{ tr.t(Sentence::RecipeAddAnIngredient) }}">
     </div>
 
     <div class="ingredient">
         <span class="drag-handle"></span>
 
         <label for="input-ingredient-name">{{ tr.t(Sentence::RecipeIngredientName) }}</label>
-        <input class="input-ingredient-name" type="text" />
+        <input class="input-ingredient-name" type="text">
 
         <label for="input-ingredient-quantity">{{ tr.t(Sentence::RecipeIngredientQuantity) }}</label>
-        <input class="input-ingredient-quantity" type="number" step="0.1" min="0" max="10000" />
+        <input class="input-ingredient-quantity" type="number" step="0.1" min="0" max="10000">
 
         <label for="input-ingredient-unit">{{ tr.t(Sentence::RecipeIngredientUnit) }}</label>
-        <input class="input-ingredient-unit" type="text" />
+        <input class="input-ingredient-unit" type="text">
 
         <label for="input-ingredient-comment">{{ tr.t(Sentence::RecipeIngredientComment) }}</label>
-        <input class="input-ingredient-comment" type="text" />
+        <input class="input-ingredient-comment" type="text">
 
-        <input class="input-ingredient-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveIngredient) }}" />
+        <input class="input-ingredient-delete" type="button" value="{{ tr.t(Sentence::RecipeRemoveIngredient) }}">
     </div>
 
     <div class="dropzone"></div>
diff --git a/backend/templates/recipe_view.html b/backend/templates/recipe_view.html
index c514d83..8b06a2f 100644
--- a/backend/templates/recipe_view.html
+++ b/backend/templates/recipe_view.html
@@ -97,7 +97,8 @@
             {% else %}
                 4
             {% endif %}
-            "/>
+            "
+        >
 
         <input
             id="input-add-ingredients-to-shopping-list"
diff --git a/backend/templates/recipes_list_fragment.html b/backend/templates/recipes_list_fragment.html
index 3574398..92d0544 100644
--- a/backend/templates/recipes_list_fragment.html
+++ b/backend/templates/recipes_list_fragment.html
@@ -30,7 +30,7 @@
     </nav>
 
     {% if !recipes.unpublished.is_empty() %}
-    <hr />
+    <hr>
     {% endif %}
 
     <nav class="recipes-list-published">
diff --git a/backend/templates/reset_password.html b/backend/templates/reset_password.html
index 8df3fc9..08cd9a8 100644
--- a/backend/templates/reset_password.html
+++ b/backend/templates/reset_password.html
@@ -5,16 +5,16 @@
 <div class="content" id="reset-password">
     <form action="/reset_password" method="post">
         <label for="password_field_1">Choose a new password (minimum 8 characters)</label>
-        <input id="password_field_1" type="password" name="password_1" />
+        <input id="password_field_1" type="password" name="password_1">
 
         <label for="password_field_1">Re-enter password</label>
-        <input id="password_field_2" type="password" name="password_2" />
+        <input id="password_field_2" type="password" name="password_2">
 
         {{ message_password }}
 
-        <input type="hidden" name="reset_token" value="{{ reset_token }}" />
+        <input type="hidden" name="reset_token" value="{{ reset_token }}">
 
-        <input type="submit" name="commit" value="Reset password" />
+        <input type="submit" name="commit" value="Reset password">
     </form>
     {{ message }}
 </div>
diff --git a/backend/templates/sign_in_form.html b/backend/templates/sign_in_form.html
index 0f2d204..379c9aa 100644
--- a/backend/templates/sign_in_form.html
+++ b/backend/templates/sign_in_form.html
@@ -8,14 +8,15 @@
 
     <form action="/signin" method="post">
         <label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label>
-        <input id="input-email" type="email" name="email" value="{{ email }}" autocapitalize="none" autocomplete="email" autofocus="autofocus" />
+        <input id="input-email" type="email" name="email" value="{{ email }}"
+            autocapitalize="none" autocomplete="email" autofocus="autofocus">
 
         <label for="input-password">{{ tr.t(Sentence::Password) }}</label>
-        <input id="input-password" type="password" name="password" autocomplete="current-password" />
+        <input id="input-password" type="password" name="password" autocomplete="current-password">
 
-        <input type="submit" value="{{ tr.t(Sentence::SignInMenu) }}" />
+        <input type="submit" value="{{ tr.t(Sentence::SignInMenu) }}">
     </form>
-    {{ message }}
+    <span class="user-message">{{ message }}</span>
 </div>
 
 {% endblock %}
diff --git a/backend/templates/sign_up_form.html b/backend/templates/sign_up_form.html
index ee53ba6..a59774b 100644
--- a/backend/templates/sign_up_form.html
+++ b/backend/templates/sign_up_form.html
@@ -10,23 +10,25 @@
         <label for="input-email">{{ tr.t(Sentence::EmailAddress) }}</label>
         <input id="input-email" type="email"
             name="email" value="{{ email }}"
-            autocapitalize="none" autocomplete="email" autofocus="autofocus" />
+            autocapitalize="none" autocomplete="email" autofocus="autofocus"
+        >
 
-        {{ message_email }}
+        <span class="user-message">{{ message_email }}</span>
 
         <label for="input-password-1">
             {{ tr.tp(Sentence::ChooseAPassword, [Box::new(common::consts::MIN_PASSWORD_SIZE)]) }}
         </label>
-        <input id="input-password-1" type="password" name="password_1" autocomplete="new-password" />
+        <input id="input-password-1" type="password" name="password_1" autocomplete="new-password">
 
         <label for="input-password-2">{{ tr.t(Sentence::ReEnterPassword) }}</label>
-        <input id="input-password-2" type="password" name="password_2" autocomplete="new-password" />
+        <input id="input-password-2" type="password" name="password_2" autocomplete="new-password">
 
-        {{ message_password }}
+        <span class="user-message">{{ message_password }}</span>
 
-        <input type="submit" name="commit" value="{{ tr.t(Sentence::SignUpButton) }}" />
+        <input type="submit" name="commit" value="{{ tr.t(Sentence::SignUpButton) }}">
     </form>
-    {{ message }}
+
+    <span class="user-message">{{ message }}</span>
 </div>
 
 {% endblock %}
diff --git a/backend/templates/title.html b/backend/templates/title.html
index 5c0fecc..4387ee2 100644
--- a/backend/templates/title.html
+++ b/backend/templates/title.html
@@ -1 +1 @@
-<a class="title" href="/"><img class="logo" src="/static/logo.svg" alt="logo"/>{{ tr.t(Sentence::MainTitle) }}</a>
\ No newline at end of file
+<a class="title" href="/"><img class="logo" src="/static/logo.svg" alt="logo">{{ tr.t(Sentence::MainTitle) }}</a>
\ No newline at end of file
