diff --git a/templates/capsule/groups/capsule_groups.html.twig b/templates/capsule/groups/capsule_groups.html.twig
index 608582f983b54d40c33bd6de8b03d5a314626008..c2c3ad17f92e4e6089258e760073a01411688219 100644
--- a/templates/capsule/groups/capsule_groups.html.twig
+++ b/templates/capsule/groups/capsule_groups.html.twig
@@ -1,71 +1,91 @@
 {% extends 'layout.html.twig' %}
 
 {% block title %}
-    {{ 'groups.edit.title'|trans }}
-    -
-    {{ parent() }}
+  {{ 'groups.edit.title'|trans }}
+  -
+  {{ parent() }}
 {% endblock %}
 
 {% block body %}
 
-    <div>
-        <div class="row w-100 gx-0">
-            <div class="row-title-box">
-                <h3 class="row-title">
-                    {{ 'groups.edit.title_with_capsule_name'|trans({'%capsule_name%': capsule.getName()}) }}
-                </h3>
-            </div>
-        </div>
+  <div>
+    <div class="row w-100 gx-0">
+      <div class="row-title-box">
+        <h3 class="row-title">
+          {{ 'groups.edit.title_with_capsule_name'|trans({'%capsule_name%': capsule.getName()}) }}
+        </h3>
+      </div>
+    </div>
 
-        {% for flashWarning in app.flashes('warning') %}
-            <div class="flash-message text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert">
-                {{ flashWarning }}
-            </div>
-        {% endfor %}
+    {% for flashWarning in app.flashes('warning') %}
+      <div class="flash-message text-center alert alert-warning col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5"
+           role="alert">
+        {{ flashWarning }}
+      </div>
+    {% endfor %}
 
-        {% for flashSuccess in app.flashes('success') %}
-            <div class="flash-message text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5" role="alert">
-                {{ flashSuccess }}
-            </div>
-        {% endfor %}
+    {% for flashSuccess in app.flashes('success') %}
+      <div class="flash-message text-center alert alert-success col-11 col-md-10 col-lg-8 col-xl-6 mx-auto mb-5"
+           role="alert">
+        {{ flashSuccess }}
+      </div>
+    {% endfor %}
+
+    <div class="d-flex flex-column justify-content-between">
 
-        <div class="d-flex flex-md-row flex-column justify-content-center">
+      <div class="d-flex flex-row mb-5 justify-content-center">
+        <div class="d-flex flex-row pe-md-5 pb-3 fw-normal me-0 me-md-5 col-3">
+          <div class="d-flex flex-row pe-3 pe-md-4 text-nowrap">
+            <h5>
+              {{ 'groups.general.title'|trans }}
+            </h5>
+          </div>
+        </div>
+        <div class="order-md-2 mb-4 col-sm-8 col-md-6 col-lg-5 col-xl-4">
+          <a href="{{ path('edit_user_groups') }}" class="btn btn-standard">{{ 'groups.create.title'|trans }}</a>
+        </div>
+      </div>
 
-            <div class="d-flex flex-row pe-md-5 pb-3 fw-normal me-0 me-md-5">
-                <div class="pe-3 pe-md-4 text-nowrap">
-                    <h5>
-                        {{ 'groups.list.title'|trans }}
-                    </h5>
-                    <ul class="ps-0">
-                        {% for group in groups %}
-                            {% if group.getName() != 'groups.filter.no_filter'|trans %}
-                                <li class="text-secondary list-unstyled p-1">
+      <div class="d-flex flex-row mb-5 justify-content-center">
+        <div class="d-flex flex-row pe-md-5 pb-3 fw-normal me-0 me-md-5 col-3">
+          <div class="pe-3 pe-md-4 text-nowrap">
+            <h5>
+              {{ 'groups.list.title'|trans }}
+            </h5>
+            <ul class="ps-0">
+              {% for group in groups %}
+                {% if group.getName() != 'groups.filter.no_filter'|trans %}
+                  <li class="text-secondary list-unstyled p-1">
                                     <span class="text-capitalize">
                                         {{ group.getName() }}
                                     </span>
-                                        -
-                                    <a href="{{ path('remove_group', { 'capsule_id': capsule.getId(), 'group_id':group.getId()  }) }}" class="remove-link">
-                                        {{ 'groups.remove.link'|trans }}
-                                    </a>
-                                </li>
-                            {% endif %}
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
-
-            <div class="d-flex flex-column justify-content-center order-md-2 mb-4 col-sm-8 col-md-6 col-lg-5 col-xl-4">
-                {% if groups_not_added is not empty %}
-                    <div class="d-flex flex-column justify-content-center mb-4">
-                        {{ form_start(selectCapsuleGroupsForm, {'attr': {novalidate: 'novalidate'}}) }}
-                        {{ form_row(selectCapsuleGroupsForm.name, {'row_attr': {'class' : 'm-auto mb-4'}})  }}
-                        {{ form_row(selectCapsuleGroupsForm.validate) }}
-                        {{ form_end(selectCapsuleGroupsForm) }}
-                    </div>
+                    -
+                    <a href="{{ path('remove_group', { 'capsule_id': capsule.getId(), 'group_id':group.getId()  }) }}"
+                       class="remove-link">
+                      {{ 'groups.remove.link'|trans }}
+                    </a>
+                  </li>
                 {% endif %}
-            </div>
+              {% endfor %}
+            </ul>
+          </div>
+        </div>
 
+        <div
+            class="d-flex flex-column justify-content-center order-md-2 mb-4 col-sm-8 col-md-6 col-lg-5 col-xl-4">
+          {% if groups_not_added is not empty %}
+            <div class="d-flex flex-column justify-content-center mb-4">
+              {{ form_start(selectCapsuleGroupsForm, {'attr': {novalidate: 'novalidate'}}) }}
+              {{ form_row(selectCapsuleGroupsForm.name, {'row_attr': {'class' : 'm-auto mb-4'}}) }}
+              {{ form_row(selectCapsuleGroupsForm.validate) }}
+              {{ form_end(selectCapsuleGroupsForm) }}
+            </div>
+          {% endif %}
         </div>
+
+      </div>
     </div>
 
-{%  endblock %}
\ No newline at end of file
+  </div>
+
+{% endblock %}
\ No newline at end of file