diff --git a/build/generic/view/machine/group/main.twig b/build/generic/view/machine/group/main.twig
index 1ce7523..e836acd 100644
--- a/build/generic/view/machine/group/main.twig
+++ b/build/generic/view/machine/group/main.twig
@@ -43,7 +43,7 @@
 
 				{% endblock %}
 
-				{% block card_group %}
+				{% block card_members %}
 
 					<span class='groups'>
 						{{ core.icon.group | raw }}
diff --git a/build/generic/view/user/group/main.twig b/build/generic/view/user/group/main.twig
index e805cc2..3c37653 100644
--- a/build/generic/view/user/group/main.twig
+++ b/build/generic/view/user/group/main.twig
@@ -1,44 +1,65 @@
-<input type='text' class='searchbar' placeholder='Recherche'>
+{% block search_bar %} <input type='text' class='searchbar' placeholder='Recherche'> {% endblock %}
 
-{% for cluster in core.get_clusters() %}
-	<article class='inline-box' id='{{ cluster.id_user_cluster }}'>
+{% block group_list %}
 
-		{% set userlist = core.get_members(cluster.id_user_cluster) %}
+	{% for cluster in core.get_clusters() %}
 
+		{% block group_card %}
 
-		<span class='title' style='color: {{ core.theme }}'>{{ cluster.name }}</span>
-		<span class='link_remove' data-cluster='{{ cluster.id_user_cluster }}'>{{ core.icon.remove | raw }}</span>
+			{% block card_tag %} <article class='inline-box' id='{{ cluster.id_user_cluster }}'> {% endblock %}
 
-		<span class='link_edit' data-cluster='{{ cluster.id_user_cluster }}'>{{ core.icon.edit | raw }}</span>
+				{% set userlist = core.get_members(cluster.id_user_cluster) %}
 
-		<span class='code'>
-			{{ core.icon.type | raw }}
-			<span>{{ userlist | length }} utilisateurs</span>
-		</span>
+				{% block card_title %} <span class='title' style='color: {{ core.theme }}'>{{ cluster.name }}</span> {% endblock %}
 
-		<span class='groups'>
-			{{ core.icon.group | raw }}
+				{% block card_remove %} <span class='link_remove' data-cluster='{{ cluster.id_user_cluster }}'>{{ core.icon.remove | raw }}</span> {% endblock %}
+				{% block card_edit %}   <span class='link_edit'   data-cluster='{{ cluster.id_user_cluster }}'>{{ core.icon.edit   | raw }}</span> {% endblock %}
 
-			<span class='ignore'>
-				{% for user in userlist %}
+				{% block card_count %}
 
-					<span>
-						{{ user.username }}
-						<span class='rem-member' data-member='{{ user.id_user }}' data-cluster='{{ cluster.id_user_cluster }}'></span>
+					<span class='code'>
+						{{ core.icon.type | raw }}
+						<span>{{ userlist | length }} utilisateurs</span>
 					</span>
 
-				{% endfor %}
-			</span>
+				{% endblock %}
 
-			<span class='add-member' data-cluster='{{ cluster.id_user_cluster }}'>+</span>
-		</span>
+				{% block card_members %}
 
-	</article>
+					<span class='groups'>
+						{{ core.icon.group | raw }}
 
-{# if no result #}
-{% else %}
+						<span class='ignore'>
+							{% for user in userlist %}
 
-	<article class='inline-box'>
-		<span>Aucun groupe trouvé.</span>
-	</article>
-{% endfor %}
+								<span>
+									{{ user.username }}
+									<span class='rem-member' data-member='{{ user.id_user }}' data-cluster='{{ cluster.id_user_cluster }}'></span>
+								</span>
+
+							{% endfor %}
+						</span>
+
+						<span class='add-member' data-cluster='{{ cluster.id_user_cluster }}'>+</span>
+					</span>
+
+				{% endblock %}
+
+			</article>
+
+		{% endblock %}
+
+	{# if no result #}
+	{% else %}
+
+		{% block no_result %}
+
+			<article class='inline-box'>
+				<span>Aucun groupe trouvé.</span>
+			</article>
+
+		{% endblock %}
+
+	{% endfor %}
+
+{% endblock %}
\ No newline at end of file