diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model1.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model1.gaml
index 58395a34e8..6130341892 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model1.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model1.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 1
 * Author: Patrick Taillandier
 * Description: Describe here the model and its experiments
-* Tags: species, global, experiment, skill, moving
+* Tags: species, global, experiment, skill, moving, tutorial
 */
 
 model model1
diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model2.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model2.gaml
index 2be056efd9..590dd2b48b 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model2.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model2.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 2
 * Author: Patrick Taillandier
 * Description: Additions of a chart, monitor and end condition
-* Tags: chart, monitor, pause
+* Tags: chart, monitor, pause, tutorial
 */
 
 model model2
diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model3.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model3.gaml
index 2289bcd909..f2e4821b56 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model3.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model3.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 3
 * Author: Patrick Taillandier
 * Description: Importation of GIS data
-* Tags: Tag1, Tag2, TagN
+* Tags: gis, tutorial
 */
 
 model model3
diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model4.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model4.gaml
index ba6d071e17..0c8143a906 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model4.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model4.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 4
 * Author: Patrick Taillandier
 * Description: Use of a graph to constraint the movements of people
-* Tags: graph, moving
+* Tags: graph, moving, tutorial
 */
 
 model model4
diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model5.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model5.gaml
index fd0778385f..c5aaeaaa30 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model5.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model5.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 5
 * Author: Patrick Taillandier
 * Description: Define a 3D display
-* Tags: 3D, obj, opengl
+* Tags: 3D, obj, opengl, tutorial
 */
 
 model model5
diff --git a/msi.gama.models/models/Tutorials/Luneray flu/models/model6.gaml b/msi.gama.models/models/Tutorials/Luneray flu/models/model6.gaml
index d8538c54e8..6888632f6d 100644
--- a/msi.gama.models/models/Tutorials/Luneray flu/models/model6.gaml	
+++ b/msi.gama.models/models/Tutorials/Luneray flu/models/model6.gaml	
@@ -2,7 +2,7 @@
 * Name: Luneray's flu 6
 * Author: Patrick Taillandier
 * Description: Exploration of the model
-* Tags: batch, genetic, save
+* Tags: batch, genetic, save, tutorial
 */
 
 model model6
@@ -102,6 +102,8 @@ experiment main type: gui {
 	parameter "Nb people infected at init" var: nb_infected_init min: 1 max: 2147;
 
 	output {
+		
+		layout #split ;
 		monitor "Infected people rate" value: infected_rate;
 		
 		display map {
@@ -110,7 +112,7 @@ experiment main type: gui {
 			species people aspect:circle;			
 		}
 	
-		display chart_display refresh: every(10 #cycles) {
+		display chart_display type: java2D refresh: every(10 #cycles) {
 			chart "Disease spreading" type: series {
 				data "susceptible" value: nb_people_not_infected color: #green;
 				data "infected" value: nb_people_infected color: #red;