diff --git a/build/generic/view/machine/view/main.twig b/build/generic/view/machine/view/main.twig
index ee018ce..2c1c82b 100644
--- a/build/generic/view/machine/view/main.twig
+++ b/build/generic/view/machine/view/main.twig
@@ -22,14 +22,18 @@
 					<span class='groups'>
 						{{ core.icon.group | raw }}
 
-						<span class='ignore'>
-							{% for cluster in core.get_clusters(machine.id_machine) %}
-								<span>
-									{{ cluster.name }}
-									<span class='rem-group' data-group='{{ cluster.id_machine_cluster }}' data-machine='{{ machine.id_machine }}'></span>
-								</span>
-							{% endfor %}
-						</span>
+						{% block group_list %}
+
+							<span class='ignore'>
+								{% for cluster in core.get_clusters(machine.id_machine) %}
+									<span>
+										{% block group_name %} {{ cluster.name }} {% endblock %}
+										<span class='rem-group' data-group='{{ cluster.id_machine_cluster }}' data-machine='{{ machine.id_machine }}'></span>
+									</span>
+								{% endfor %}
+							</span>
+
+						{% endblock %}
 
 						<span class='add-group' data-machine='{{ machine.id_machine }}'>+</span>
 					</span>
@@ -43,9 +47,14 @@
 	{# if no result #}
 	{% else %}
 
-		<article class='inline-box'>
-			<span>Aucune machine trouvée</span>
-		</article>
+		{% block no_result %}
+
+			<article class='inline-box'>
+				<span>Aucune machine trouvée</span>
+			</article>
+
+		{% endblock %}
+
 	{% endfor %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/build/generic/view/user/view/main.twig b/build/generic/view/user/view/main.twig
index 4cd8f99..c18310d 100644
--- a/build/generic/view/user/view/main.twig
+++ b/build/generic/view/user/view/main.twig
@@ -1,53 +1,80 @@
-<input type='text' class='searchbar' placeholder='Recherche'>
+{% block search_bar %} <input type='text' class='searchbar' placeholder='Recherche'> {% endblock %}
 
-{% for user in core.get_users() %}
+{% block user_list %}
 
-	<article class='inline-box' id='{{ user.id_user }}'>
+	{% for user in core.get_users() %}
 
-		<span class='title' style='color: {{ core.theme }}'>{{ user.firstname }} {{ user.lastname }} <span>#{{ user.username }}</span></span>
-		<span class='link_remove' data-user='{{ user.id_user }}'>{{ core.icon.remove | raw }}</span>
+		{% block user_card %}
 
-		<span class='link_edit' data-user='{{ user.id_user }}'>{{ core.icon.edit | raw }}</span>
+			{% block card_tag %} <article class='inline-box' id='{{ user.id_user }}'> {% endblock %}
 
-		<span class='code'>
-			{{ core.icon.card | raw }}
-			<span>{{ user.code }}</span>
-		</span>
+				{% block card_title %} <span class='title' style='color: {{ core.theme }}'>{{ user.firstname }} {{ user.lastname }} <span>#{{ user.username }}</span></span> {% endblock %}
 
-		<span class='mail'>
-			{{ core.icon.mail | raw }}
+				{% block card_remove %} <span class='link_remove' data-user='{{ user.id_user }}'>{{ core.icon.remove | raw }}</span> {% endblock %}
+				{% block card_edit %}   <span class='link_edit'   data-user='{{ user.id_user }}'>{{ core.icon.edit   | raw }}</span> {% endblock %}
 
-			<a href='mailto:{{ user.mail }}'>
-				<span>{{ user.mail }}</span>
-			</a>
-		</span>
+				{% block card_code %}
 
-		<span class='groups'>
-			{{ core.icon.group | raw }}
-
-			<span class='ignore'>
-				{% for cluster in core.get_clusters(user.id_user) %}
-
-
-					<span>
-						{{ cluster.name }}
-						<span class='rem-group' data-group='{{ cluster.id_user_cluster }}' data-user='{{ user.id_user }}'></span>
+					<span class='code'>
+						{{ core.icon.card | raw }}
+						<span>{{ user.code }}</span>
 					</span>
 
-				{% endfor %}
-			</span>
+				{% endblock %}
 
-			<span class='add-group' data-user='{{ user.id_user }}'>+</span>
+				{% block card_mail %}
 
-		</span>
+					<span class='mail'>
+						{{ core.icon.mail | raw }}
 
-	</article>
+						<a href='mailto:{{ user.mail }}'>
+							<span>{{ user.mail }}</span>
+						</a>
+					</span>
 
-{# if no result #}
-{% else %}
+				{% endblock %}
 
-	<article class='inline-box'>
-		<span>Aucun utilisateur trouvé</span>
-	</article>
+				{% block card_groups %}
 
-{% endfor %}
+					<span class='groups'>
+						{{ core.icon.group | raw }}
+
+						{% block group_list %}
+
+							<span class='ignore'>
+								{% for cluster in core.get_clusters(user.id_user) %}
+
+									<span>
+											{% block group_name %} {{ cluster.name }} {% endblock %}
+										<span class='rem-group' data-group='{{ cluster.id_user_cluster }}' data-user='{{ user.id_user }}'></span>
+									</span>
+
+								{% endfor %}
+							</span>
+
+						{% endblock %}
+
+						<span class='add-group' data-user='{{ user.id_user }}'>+</span>
+
+					</span>
+
+				{% endblock %}
+
+			</article>
+
+		{% endblock %}
+
+	{# if no result #}
+	{% else %}
+
+		{% block no_result %}
+
+			<article class='inline-box'>
+				<span>Aucun utilisateur trouvé</span>
+			</article>
+
+		{% endblock %}
+
+	{% endfor %}
+
+{% endblock %}
\ No newline at end of file