diff --git a/templates/common/layout.twig b/templates/common/layout.twig
index 72bbf701295d47e8d3820b9875a1364ea8dfe23c..f135187274461faa97bb00fb9fd9f508b7d74126 100644
--- a/templates/common/layout.twig
+++ b/templates/common/layout.twig
@@ -10,69 +10,72 @@
 
 </head>
 <body>
-    <div class="container-wrapper">
-    {% block navbar %}
-    <div class="ui inverted menu header" id="header-content">
-        <img src="/assets/img/covid-logo.png" class="ui huge spaced icon">
-        <a href="/" class="active item">Home</a>
-        <div class="right menu">
-            {% if session.userId %}
-            <div class="item">
-                <a href="/account"><i class="user circle icon"></i>Profile</a>
-            </div>
-            <div class="item">
-                <a href="/logout">Log out</a>
-            </div>
-            {% else %}
-                <div class="item">
-                    <a href="/login">Log in</a>
-                </div>
-                <div class="item">
-                    <a href="/signup">Sign up</a>
-                </div>
-            {% endif %}
-            <div class="ui dropdown item">
-                Categories <i class="dropdown icon"></i>
-                <div class="menu">
-                    <a href="/users" class="item">Users</a>
-                    <a href="/map" class="item">Map</a>
-                    <a href="/groups" class="item">Groups</a>
+    <div class="main-wrapper">
+        <div class="container-wrapper">
+            {% block navbar %}
+            <div class="ui inverted menu header" id="header-content">
+                <img src="/assets/img/covid-logo.png" class="ui huge spaced icon">
+                <a href="/" class="active item">Home</a>
+                <div class="right menu">
+                    {% if session.userId %}
+                    <div class="item">
+                        <a href="/account"><i class="user circle icon"></i>Profile</a>
+                    </div>
+                    <div class="item">
+                        <a href="/logout">Log out</a>
+                    </div>
+                    {% else %}
+                        <div class="item">
+                            <a href="/login">Log in</a>
+                        </div>
+                        <div class="item">
+                            <a href="/signup">Sign up</a>
+                        </div>
+                    {% endif %}
+                    <div class="ui dropdown item">
+                        Categories <i class="dropdown icon"></i>
+                        <div class="menu">
+                            <a href="/users" class="item">Users</a>
+                            <a href="/map" class="item">Map</a>
+                            <a href="/groups" class="item">Groups</a>
+                        </div>
+                    </div>
+                    <div class="item">
+                        <form role="search" action="/search" method="post">
+                            <div class="ui icon input">
+                                <input type="text" id="search" name="search" placeholder="Search...">
+                                <button type="submit" class="ui circular icon button large "><i class="search link icon"></i></button>
+                            </div>
+                        </form>
+                    </div>
                 </div>
             </div>
-            <div class="item">
-                <form role="search" action="/search" method="post">
-                    <div class="ui icon input">
-                        <input type="text" id="search" name="search" placeholder="Search...">
-                        <button type="submit" class="ui circular icon button large "><i class="search link icon"></i></button>
-                    </div>
-                </form>
+            {% endblock %}
+            
+            <div class="content" id="content">
+                {% if message %}
+                <div class="ui message">
+                    {{message}}
+                </div>
+                {% endif %}
+                
+                {% block content %} {% endblock %}
             </div>
-        </div>
-    </div>
-    {% endblock %}
-    <div class="content">
-    {% if message %}
-    <div class="ui message">
-        {{message}}
-    </div>
-    {% endif %}
-    {% block content %} {% endblock %}
-    </div>
-    {% block footer %}
-    <!-- Footer -->
-    <div class="ui center aligned inverted vertical footer-content segment" id='footer-content'>
-        <div class="ui container">
-            <div class="ui inverted section divider"></div>
-                <p> Copyright : moreau96u | elise.moreau9@univ-lorraine.com </p>
+
+            {% block footer %}
+            <!-- Footer -->
+            <div class="ui center aligned inverted vertical footer-content segment" id='footer-content'>
+                <div class="ui container">
+                    <div class="ui inverted section divider"></div>
+                    <p>Copyright : moreau96u | elise.moreau9@univ-lorraine.com</p>
+                </div>
             </div>
+            {% endblock %}
         </div>
     </div>
-    </div>
-    {% endblock %}
-    </div>
-<script type="text/javascript" src="/assets/js/jquery-3.5.1.min.js"></script>
-<script type="text/javascript" src="/assets/semantic-ui/semantic.min.js"></script>
-<script type="text/javascript" src="/assets/js/general.js"></script>
 
+    <script type="text/javascript" src="/assets/js/jquery-3.5.1.min.js"></script>
+    <script type="text/javascript" src="/assets/semantic-ui/semantic.min.js"></script>
+    <script type="text/javascript" src="/assets/js/general.js"></script>
 </body>
 </html>
\ No newline at end of file