diff --git a/blog/templates/blog/blog_entry_page.html b/blog/templates/blog/blog_entry_page.html
index b8d5ea20..4bba0aa7 100644
--- a/blog/templates/blog/blog_entry_page.html
+++ b/blog/templates/blog/blog_entry_page.html
@@ -44,7 +44,6 @@
 
 {% block content %}
   {% include "content_manager/blocks/heading.html" %}
-  {% include "content_manager/blocks/messages.html" %}
 
   {% with categories=page.blog_categories.all %}
     <div class="fr-container fr-mt-6w">
@@ -71,6 +70,8 @@ <h1>
       </p>
     </div>
 
+    {% include "content_manager/blocks/messages.html" %}
+
     {% include "content_manager/blocks/blocks_stream.html" with stream=page.body %}
 
     {% with authors=page.authors.all %}
diff --git a/blog/templates/blog/categories_list_page.html b/blog/templates/blog/categories_list_page.html
index 72729f73..a41b934b 100644
--- a/blog/templates/blog/categories_list_page.html
+++ b/blog/templates/blog/categories_list_page.html
@@ -13,8 +13,6 @@
 {% endif %}
 
 {% block content %}
-  {% include "content_manager/blocks/messages.html" %}
-
   <div class="fr-container fr-my-6w">
     {% include "content_manager/blocks/breadcrumbs.html" %}
     {% if not page.header_with_title %}
@@ -23,6 +21,9 @@ <h1>
         {% if extra_title %}: {{ extra_title }}{% endif %}
       </h1>
     {% endif %}
+
+    {% include "content_manager/blocks/messages.html" %}
+
     <ul>
       {% for category in categories|dictsort:"cat_name" %}
         <li>
diff --git a/blog/templates/blog/tags_list_page.html b/blog/templates/blog/tags_list_page.html
index dd4a2869..6a9199f5 100644
--- a/blog/templates/blog/tags_list_page.html
+++ b/blog/templates/blog/tags_list_page.html
@@ -13,12 +13,12 @@
 {% endif %}
 
 {% block content %}
-  {% include "content_manager/blocks/messages.html" %}
-
   <div class="fr-container fr-my-6w">
     {% dsfr_breadcrumb breadcrumb %}
     <h1>{% translate "Tags" %}</h1>
 
+    {% include "content_manager/blocks/messages.html" %}
+
     <div class="fr-mb-2w">
       {% for first_letter in sorted_tags.keys|dictsort:0 %}
         <a href="#{{ first_letter }}" class="fr-tag">{{ first_letter }}</a>
diff --git a/content_manager/templates/content_manager/catalog_index_page.html b/content_manager/templates/content_manager/catalog_index_page.html
index 2cea8511..5d693f2d 100644
--- a/content_manager/templates/content_manager/catalog_index_page.html
+++ b/content_manager/templates/content_manager/catalog_index_page.html
@@ -43,7 +43,6 @@
 
 {% block content %}
   {% include "content_manager/blocks/heading.html" %}
-  {% include "content_manager/blocks/messages.html" %}
 
   <div class="fr-container fr-pt-4w">
     {% include "content_manager/blocks/breadcrumbs.html" %}
@@ -55,10 +54,12 @@ <h1>
       </h1>
     {% endif %}
 
+    {% include "content_manager/blocks/messages.html" %}
+
     {% if current_category.description %}
-      {{ current_category.description|richtext }}
+      <div class="fr-mb-4w">{{ current_category.description|richtext }}</div>
     {% else %}
-      {{ page.body }}
+      <div class="fr-mb-4w">{{ page.body }}</div>
     {% endif %}
 
     {% if page.show_filters %}
diff --git a/content_manager/templates/content_manager/sitemap_page.html b/content_manager/templates/content_manager/sitemap_page.html
index 5bf2ad2a..f904e4f6 100644
--- a/content_manager/templates/content_manager/sitemap_page.html
+++ b/content_manager/templates/content_manager/sitemap_page.html
@@ -11,11 +11,10 @@
 {% endblock description %}
 
 {% block content %}
-  {% include "content_manager/blocks/messages.html" %}
-
   <div class="fr-container fr-mt-6w">
     {% dsfr_breadcrumb breadcrumb %}
     <h1>{% translate "Sitemap" %}</h1>
+    {% include "content_manager/blocks/messages.html" %}
   </div>
 
   <div class="fr-container fr-mt-6w">
diff --git a/content_manager/templates/content_manager/tag_page.html b/content_manager/templates/content_manager/tag_page.html
index 750c9d36..3784f754 100644
--- a/content_manager/templates/content_manager/tag_page.html
+++ b/content_manager/templates/content_manager/tag_page.html
@@ -3,65 +3,65 @@
 {% load static dsfr_tags wagtailcore_tags wagtailimages_tags i18n %}
 
 {% block title %}
-    <title>{{ title }} — {{ settings.content_manager.CmsDsfrConfig.site_title }}</title>
+  <title>{{ title }} — {{ settings.content_manager.CmsDsfrConfig.site_title }}</title>
 {% endblock title %}
 
 {% block description %}
-    <meta name="description" content="{{ search_description }}" />
+  <meta name="description" content="{{ search_description }}" />
 {% endblock description %}
 
 {% block social_media %}
-    <meta property="og:site_name"
-          content="{{ settings.content_manager.CmsDsfrConfig.site_title }}" />
-    <meta property="og:title" content="{{ title }}" />
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="{{ request.build_absolute_uri }}" />
-    <meta property="og:description" content="{{ search_description }}" />
-    <meta property="og:locale" content="{{ LANGUAGE_CODE }}" />
+  <meta property="og:site_name"
+        content="{{ settings.content_manager.CmsDsfrConfig.site_title }}" />
+  <meta property="og:title" content="{{ title }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="{{ request.build_absolute_uri }}" />
+  <meta property="og:description" content="{{ search_description }}" />
+  <meta property="og:locale" content="{{ LANGUAGE_CODE }}" />
 
-    <meta name="twitter:title" content="{{ title }}" />
-    <meta name="twitter:description" content="{{ search_description }}" />
+  <meta name="twitter:title" content="{{ title }}" />
+  <meta name="twitter:description" content="{{ search_description }}" />
 {% endblock social_media %}
 
 {% block content %}
-    {% include "content_manager/blocks/messages.html" %}
 
-    <div class="fr-container fr-mt-6w">
-        {% dsfr_breadcrumb breadcrumb %}
-        <h1>{{ title }}</h1>
-    </div>
+  <div class="fr-container fr-mt-6w">
+    {% dsfr_breadcrumb breadcrumb %}
+    <h1>{{ title }}</h1>
+    {% include "content_manager/blocks/messages.html" %}
+  </div>
 
-    <div class="fr-container fr-mt-6w">
-        <div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
-            {% for entry in object_list %}
-                <div class="fr-col fr-col-md-6">
-                    <div class="fr-card fr-enlarge-link">
-                        <div class="fr-card__body">
-                            <div class="fr-card__content">
-                                <h2 class="fr-card__title">
-                                    <a href="{{ entry.url }}">{{ entry.title }}</a>
-                                </h2>
-                            </div>
-                        </div>
-                        {% if entry.header_image %}
-                            <div class="fr-card__header">
-                                <div class="fr-card__img">
-                                    <img class="fr-responsive-img"
-                                         src="{{ entry.header_image.file.url }}"
-                                         alt="">
-                                </div>
-                            </div>
-                        {% endif %}
-                    </div>
+  <div class="fr-container fr-mt-6w">
+    <div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
+      {% for entry in object_list %}
+        <div class="fr-col fr-col-md-6">
+          <div class="fr-card fr-enlarge-link">
+            <div class="fr-card__body">
+              <div class="fr-card__content">
+                <h2 class="fr-card__title">
+                  <a href="{{ entry.url }}">{{ entry.title }}</a>
+                </h2>
+              </div>
+            </div>
+            {% if entry.header_image %}
+              <div class="fr-card__header">
+                <div class="fr-card__img">
+                  <img class="fr-responsive-img"
+                       src="{{ entry.header_image.file.url }}"
+                       alt="">
                 </div>
-            {% empty %}
-                <p>Aucun article trouvé.</p>
-            {% endfor %}
+              </div>
+            {% endif %}
+          </div>
         </div>
+      {% empty %}
+        <p>Aucun article trouvé.</p>
+      {% endfor %}
     </div>
+  </div>
 
-    {% if posts.paginator.num_pages > 1 %}
-        <div class="fr-container fr-grid-row fr-grid-row--center fr-mt-6w">{% dsfr_pagination posts %}</div>
-    {% endif %}
+  {% if posts.paginator.num_pages > 1 %}
+    <div class="fr-container fr-grid-row fr-grid-row--center fr-mt-6w">{% dsfr_pagination posts %}</div>
+  {% endif %}
 
 {% endblock content %}
diff --git a/content_manager/templates/content_manager/tags_list_page.html b/content_manager/templates/content_manager/tags_list_page.html
index 8cd8c2ce..21b8de77 100644
--- a/content_manager/templates/content_manager/tags_list_page.html
+++ b/content_manager/templates/content_manager/tags_list_page.html
@@ -30,8 +30,6 @@
 {% endblock social_media %}
 
 {% block content %}
-  {% include "content_manager/blocks/messages.html" %}
-
   <div class="fr-container fr-my-6w">
     {% if page %}
       {% include "content_manager/blocks/breadcrumbs.html" %}
@@ -49,6 +47,8 @@ <h1>
       <h1>{% translate "Tags" %}</h1>
     {% endif %}
 
+    {% include "content_manager/blocks/messages.html" %}
+
     <div class="fr-mb-2w">
       {% for first_letter in sorted_tags.keys|dictsort:0 %}
         <a href="#{{ first_letter }}" class="fr-tag">{{ first_letter }}</a>
diff --git a/events/templates/events/event_entry_page.html b/events/templates/events/event_entry_page.html
index 4669f29b..2d6c0faa 100644
--- a/events/templates/events/event_entry_page.html
+++ b/events/templates/events/event_entry_page.html
@@ -44,7 +44,6 @@
 
 {% block content %}
   {% include "content_manager/blocks/heading.html" %}
-  {% include "content_manager/blocks/messages.html" %}
 
   {% with categories=page.event_categories.all %}
 
@@ -78,6 +77,8 @@ <h1 class="fr-display--sm">{{ page.title }}</h1>
       </p>
     </div>
 
+    {% include "content_manager/blocks/messages.html" %}
+
     {% include "content_manager/blocks/blocks_stream.html" with stream=page.body %}
 
     {% with authors=page.authors.all %}
diff --git a/events/templates/events/events_archive_page.html b/events/templates/events/events_archive_page.html
index 7d006ae5..e76002d3 100644
--- a/events/templates/events/events_archive_page.html
+++ b/events/templates/events/events_archive_page.html
@@ -43,7 +43,6 @@
 
 {% block content %}
   {% include "content_manager/blocks/heading.html" %}
-  {% include "content_manager/blocks/messages.html" %}
 
   <div class="fr-container fr-pt-4w">
     {% include "content_manager/blocks/breadcrumbs.html" %}
@@ -54,10 +53,12 @@ <h1>
       </h1>
     {% endif %}
 
+    {% include "content_manager/blocks/messages.html" %}
+
     {% if current_category.description %}
-      {{ current_category.description|richtext }}
+      <div class="fr-mb-4w">{{ current_category.description|richtext }}</div>
     {% else %}
-      {{ page.body }}
+      <div class="fr-mb-4w">{{ page.body }}</div>
     {% endif %}
 
     <div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
diff --git a/events/templates/events/events_index_page.html b/events/templates/events/events_index_page.html
index 08b97d58..48cec08e 100644
--- a/events/templates/events/events_index_page.html
+++ b/events/templates/events/events_index_page.html
@@ -60,6 +60,7 @@ <h1>
     {% else %}
       <div class="fr-mb-4w">{{ page.body }}</div>
     {% endif %}
+
     <div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
       <div class="fr-col fr-col-md-4 fr-col-12">
         <nav class="fr-sidemenu fr-sidemenu--sticky-full-height fr-mb-0-5v">
diff --git a/forms/templates/forms/form_page.html b/forms/templates/forms/form_page.html
index 67488814..6d7d5e44 100644
--- a/forms/templates/forms/form_page.html
+++ b/forms/templates/forms/form_page.html
@@ -10,7 +10,6 @@
   <div class="fr-container fr-pt-4w">
     {% include "content_manager/blocks/breadcrumbs.html" %}
     <h1>{{ page.title }}</h1>
-
   </div>
 
   {% include "content_manager/blocks/messages.html" %}