diff --git a/build/viewer/view/history/view.twig b/build/viewer/view/history/view.twig
index 7c9c72d..195d6c0 100644
--- a/build/viewer/view/history/view.twig
+++ b/build/viewer/view/history/view.twig
@@ -1,18 +1,25 @@
 <input type='text' class='searchbar' placeholder='Recherche'>
 
-<article class='inline-row' style='border: 0; box-shadow: none;background: transparent;'>
-	<span>Machine</span>
-	<span>Dernière utilisation</span>
-	<span>Utilisateur</span>
-	<span>Action</span>
-	<span>Historique détaillé</span>
-</article>
 
 
 {% for entry in f_history() %}
+
+
+	{% if loop.index == 1 %}
+
+		<article class='inline-row' style='border: 0; box-shadow: none;background: transparent;'>
+			<span>Machine</span>
+			<span>Dernière utilisation</span>
+			<span>Utilisateur</span>
+			<span>Action</span>
+			<span>Historique détaillé</span>
+		</article>
+
+	{% endif %}
+
 	<article class='inline-row' data-history='{{ entry.id_history }}'>
 
-		<span class='title'><span>#{{ entry.machine_name }}</span></span>
+		<span data-machine='{{ entry.id_machine }}' class='title'><span>#{{ entry.machine_name }}</span></span>
 
 		<span>
 			<span>{{ entry.timestamp | f_tsformat }}</span>
@@ -20,7 +27,7 @@
 		</span>
 
 
-		<span>
+		<span data-user='{{ entry.id_user }}'>
 			<span>{{ entry.user_name }}</span>
 			<span style='color:#aaa;'>{{ entry.user_firstname }} {{ entry.user_lastname }}</span>
 		</span>
diff --git a/build/viewer/view/machine/groups.twig b/build/viewer/view/machine/groups.twig
index 928bafc..c93ac6c 100644
--- a/build/viewer/view/machine/groups.twig
+++ b/build/viewer/view/machine/groups.twig
@@ -3,6 +3,8 @@
 {% for cluster in f_clusters() %}
 	<article class='inline-box' id='{{ cluster.id_machine_cluster }}'>
 
+		{% set machinelist = f_machines(cluster.id_machine_cluster) %}
+
 		<span class='title' style='color: {{ p_theme }}'>{{ cluster.name }}</span>
 		<span class='link_remove' data-cluster='{{ cluster.id_machine_cluster }}'>{{ p_icon.remove | raw }}</span>
 
@@ -10,13 +12,13 @@
 
 		<span class='code'>
 			{{ p_icon.device | raw }}
-			<span>{{ f_machines(cluster.id_machine_cluster) | length }} machines</span>
+			<span>{{ machinelist | length }} machines</span>
 		</span>
 
 		<span class='groups'>
 			{{ p_icon.group | raw }}
 
-			{% for machine in f_machines(cluster.id_machine_cluster) %}
+			{% for machine in machinelist %}
 				<span>
 					{{ machine.name }}
 					<span class='rem-member' data-member='{{ machine.id_machine }}' data-cluster='{{ cluster.id_machine_cluster }}'></span>
diff --git a/build/viewer/view/user/groups.twig b/build/viewer/view/user/groups.twig
index c2424f8..58be65a 100644
--- a/build/viewer/view/user/groups.twig
+++ b/build/viewer/view/user/groups.twig
@@ -2,6 +2,9 @@
 
 {% for cluster in f_clusters() %}
 	<article class='inline-box' id='{{ cluster.id_user_cluster }}'>
+		
+		{% set userlist = f_users(cluster.id_user_cluster) %}
+
 
 		<span class='title' style='color: {{ p_theme }}'>{{ cluster.name }}</span>
 		<span class='link_remove' data-cluster='{{ cluster.id_user_cluster }}'>{{ p_icon.remove | raw }}</span>
@@ -10,13 +13,13 @@
 
 		<span class='code'>
 			{{ p_icon.type | raw }}
-			<span>{{ f_users(cluster.id_user_cluster) | length }} utilisateurs</span>
+			<span>{{ userlist | length }} utilisateurs</span>
 		</span>
 
 		<span class='groups'>
 			{{ p_icon.group | raw }}
 
-			{% for user in f_users(cluster.id_user_cluster) %}
+			{% for user in userlist %}
 
 				<span>
 					{{ user.username }}