diff --git a/admin/c2cgeoportal_admin/schemas/treegroup.py b/admin/c2cgeoportal_admin/schemas/treegroup.py
index 0a1ca85630..ff6251f54b 100644
--- a/admin/c2cgeoportal_admin/schemas/treegroup.py
+++ b/admin/c2cgeoportal_admin/schemas/treegroup.py
@@ -168,8 +168,8 @@ def children_schema_node(only_groups: bool = False) -> colander.SequenceSchema:
                 """
                 <div class="help-block">
                     <p>The ordered children elements.</p>
+                    <hr>
                 </div>
-                <hr>
                 """
             ),
         ),
diff --git a/commons/c2cgeoportal_commons/models/main.py b/commons/c2cgeoportal_commons/models/main.py
index cd90a5194d..c2ecac9494 100644
--- a/commons/c2cgeoportal_commons/models/main.py
+++ b/commons/c2cgeoportal_commons/models/main.py
@@ -447,8 +447,8 @@ class LayerGroup(TreeGroup):
                 <h4>Background layers</h4>
                 <p>The background layers are configured in the database, with the layer group named
                 <b>background</b> (by default).</p>
+                <hr>
             </div>
-            <hr>
                 """
             )
         ),
@@ -645,8 +645,8 @@ class OGCServer(Base):  # type: ignore
                 For one server we try to create only one request when it is possible.</p>
                 <p>If you want to query the same server to get PNG and JPEG images,\n
                 you should define two <code>OGC servers</code>.</p>
+                <hr>
             </div>
-            <hr>
                 """
             )
         ),
@@ -834,8 +834,8 @@ class LayerWMS(DimensionLayer):
                 <p>Definition of a <code>WMS Layer</code>.</p>
                 <p>Note: The layers named <code>wms-defaults</code> contains the values
                 used when we create a new <code>WMS layer</code>.</p>
+                <hr>
             </div>
-            <hr>
                 """
             )
         ),
@@ -1025,8 +1025,8 @@ class LayerWMTS(DimensionLayer):
                     <li><code>wmsLayers</code> or <code>printLayers</code> with the layers to print
                         (comma separated list).</li>
                 </ul>
+                <hr>
             </div>
-            <hr>
                 """
             )
         ),
@@ -1271,8 +1271,8 @@ class RestrictionArea(Base):  # type: ignore
                         """
                         <div class="help-block">
                             <p>This restriction area will grant access to the checked layers.</p>
+                            <hr>
                         </div>
-                        <hr>
                         """
                     )
                 ),
@@ -1487,8 +1487,8 @@ class Metadata(Base):  # type: ignore
                 >
                     https://github.com/camptocamp/ngeo/blob/{MAIN_BRANCH}/contribs/gmf/src/themes.js
                 </a>.</p>
+            <hr>
         </div>
-        <hr>
                             """.format(
                                 MAIN_BRANCH="master",
                             )
@@ -1586,8 +1586,8 @@ class Dimension(Base):  # type: ignore
                             """
         <div class="help-block">
             <p>The dimensions, if not provided default values are used.</p>
+            <hr>
         </div>
-        <hr>
                             """
                         )
                     ),
diff --git a/commons/c2cgeoportal_commons/models/static.py b/commons/c2cgeoportal_commons/models/static.py
index 952bedbfb3..8f9178e63e 100644
--- a/commons/c2cgeoportal_commons/models/static.py
+++ b/commons/c2cgeoportal_commons/models/static.py
@@ -112,8 +112,8 @@ class User(Base):  # type: ignore
 
                 <p>Any other functionality (with <b>single</b> not set or set to <code>false</code>) can
                     be defined in any role linked to the user.</p>
+                <hr>
             </div>
-            <hr>
                 """
             )
         ),