diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
index 6049331..816f7ac 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
@@ -16,7 +16,8 @@
 </h4>
 
 <form:form commandName="formConference" name="monForm">
-
+	Step (1/5) <br/><br/>
+	
 	<fmt:message key="conference.title" />  <form:input path="title"/> <form:errors path="title" /> <br/><br />
 	<fmt:message key="conference.description" />  <form:textarea path="description" /> <form:errors path="description" /> <br/><br />
 	<fmt:message key="conference.otherInformations" />  <form:textarea path="otherInformations" /> <br/><br />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
index 795b4bb..2829ccf 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
@@ -20,6 +20,11 @@
 </h4>
 
 <form:form commandName="formConference" name="monForm">
+	Step (2/5) <br/>
+	
+	This step is used to define some date like the starting date for the conference.<br/>
+	You have just to click on a field and the calendar will appear.<br/>
+	<br/>
 	
 	<fmt:message key="conference2.start" /><form:input onclick="ds_sh(this);" path="dateStart" cssStyle="cursor: text" /> <form:errors path="dateStart" /><br /><br />
 	<fmt:message key="conference2.end" /><form:input onclick="ds_sh(this);" path="dateEnd" cssStyle="cursor: text" /> <form:errors path="dateEnd" /><br /><br />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
index 2acd910..23d2494 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
@@ -17,6 +17,10 @@
 </h4>
 
 <form:form commandName="formConference" name="monForm">
+	Step (3/5) <br/>
+	
+	Here you can add some constraints at your conference like the number of pages by articles or the type of file you want the authors to use.<br/>
+	<br/>
 
 	<form:errors path="*" />
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
index cd69757..c0062a1 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
@@ -11,11 +11,9 @@
 <script type='text/javascript'>
 
 function init() {
-  //fillTable2();
-  //fillTable();
-  setTimeout("fillTable2()", 500);
-  setTimeout("fillTable()", 500);
-  
+  fillTable2();
+  fillTable(); 
+  dwr.util.setValues({ id:-1, label:null, min:1, max:5 }); 
 }
 
 var peopleCache = { };
@@ -84,12 +82,12 @@ function deleteClicked(eleid) {
   if (confirm("Are you sure you want to delete " + person.label + "?")) {
     dwr.engine.beginBatch();
     AddCriteriaJS.deleteCriterion(person);
-    setTimeout("fillTable2()", 500);
-  setTimeout("fillTable()", 500);
+    fillTable2();
+    fillTable();
     dwr.engine.endBatch();
   }
   viewed = -1;
-  dwr.util.setValues({ id:-1, label:null, min:null, max:null });
+  dwr.util.setValues({ id:-1, label:null, min:1, max:5 });
 }
 
 function addClicked(eleid) {
@@ -97,31 +95,50 @@ function addClicked(eleid) {
   //person.id = -1;
   dwr.engine.beginBatch();
   AddCriteriaJS.setCriterion(person);
-  setTimeout("fillTable2()", 500);
-  setTimeout("fillTable()", 500);
+  fillTable2();
+  fillTable();
   dwr.engine.endBatch();
   viewed = -1;
-  dwr.util.setValues({ id:-1, label:null, min:null, max:null });
+  dwr.util.setValues({ id:-1, label:null, min:1, max:5 });
  }
 
 function writePerson() {
   var person = { id:viewed, label:null, min:null, max:null };
   dwr.util.getValues(person);
-
-  dwr.engine.beginBatch();
-  AddCriteriaJS.setCriterionClick(person);
-  //fillTable2();
-  //fillTable();
   
-  setTimeout("fillTable()", 500);
-  dwr.engine.endBatch();
+  if (person.max <= person.min) {
+  	dwr.util.setValues({id:person.id, label:person.label, min:null, max:null });
+  	dwr.util.setValues({errorMax:"The max value should'nt be superior to the min value"});
+  }
+  else { 
+  	dwr.engine.beginBatch();
+  	AddCriteriaJS.setCriterionClick(person);  
+  	fillTable();
+  	dwr.engine.endBatch();
+  	dwr.util.setValues({ id:-1, label:null, min:1, max:5 });
+  }
 }
 
 function clearPerson() {
   viewed = -1;
-  dwr.util.setValues({ id:-1, label:null, min:null, max:null });
+  dwr.util.setValues({ id:-1, label:null, min:1, max:5 });
 }
 
+var CritereManager = Class.create({
+	initialize: function(inputField, inputField2, inputField3){
+		$(inputField).observe("keypress", this.KeyPressHandler.bindAsEventListener(this));
+		$(inputField2).observe("keypress", this.KeyPressHandler.bindAsEventListener(this));
+		$(inputField3).observe("keypress", this.KeyPressHandler.bindAsEventListener(this));
+	},
+	KeyPressHandler: function(event){
+		switch(event.keyCode){
+			case Event.KEY_RETURN:
+				writePerson();
+				event.stop();
+				return false;
+		}
+	}
+});
 </script>
 
 </head>
@@ -140,6 +157,7 @@ function clearPerson() {
 </h4>
 
 <form:form commandName="formConference" name="monForm">
+	Step (4/5) <br/>
 
 	This step allows you to add criterion which will be used when someone will evaluate an article.<br/>
 	You can add a new criterion using the input form, or add an existing criterion.<br/>
@@ -184,16 +202,21 @@ function clearPerson() {
 		<tr>
 			<td>Max:</td>
 			<td><input id="max" type="text"/></td>
+			<td><span id="errorMax"></span></td>
 		</tr>
 		<tr>
-			<td colspan="2" align="right"><small>(ID=<span id="id">-1</span>)</small>
+			<td colspan="2" align="right"><span id="id" style="display: none;">-1</span>
 			<a href="#" onclick="writePerson()">Save</a>
 			<a href="#" onclick="clearPerson()">Clear</a>
 			</td>
+			<td></td>
 		</tr>
 	</table>
 	</fieldset>
-
+
+	<script type="text/javascript">
+    	new CritereManager('label', 'min', 'max');
+	</script>
 	
 	<br />
 	<table border="1" id="tableCriterion" style="display: none;">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
index e14c354..4087d9d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
@@ -128,6 +128,11 @@ function filterUser(el, value) {
 </h4>
 
 <form:form commandName="formConference" name="monForm">
+	Step (5/5) <br/>
+	
+	This step allows you to add PC Member to the conference.<br/>
+	You can add a PC Member using the list below, or inviting someone using his email.<br/>
+	<br/>
 
 	Filter <form:input id="myfilter" path="myfilter" />
 	<br /> <br />
diff --git a/YACOSWeb/WebContent/javascripts/calendar.js b/YACOSWeb/WebContent/javascripts/calendar.js
index 7c22674..74778c6 100644
--- a/YACOSWeb/WebContent/javascripts/calendar.js
+++ b/YACOSWeb/WebContent/javascripts/calendar.js
@@ -53,12 +53,12 @@ function ds_echo(t) {
 var ds_element; // Text Element...
 
 var ds_monthnames = [
-'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin',
-'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Décembre'
+'January', 'February', 'March', 'April', 'May', 'June',
+'July', 'August', 'September', 'October', 'November', 'December'
 ]; // You can translate it for your language.
 
 var ds_daynames = [
-'Dim', 'Lun', 'Mar', 'Me', 'Jeu', 'Ven', 'Sam'
+'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
 ]; // You can translate it for your language.
 
 // Calendar template
@@ -67,7 +67,7 @@ function ds_template_main_above(t) {
 	     + '<tr>'
 		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_py();">&lt;&lt;</td>'
 		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_pm();">&lt;</td>'
-		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_hi();" colspan="3">[Fermer]</td>'
+		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_hi();" colspan="3">[Close]</td>'
 		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_nm();">&gt;</td>'
 		 + '<td class="ds_head" style="cursor: pointer" onclick="ds_ny();">&gt;&gt;</td>'
 		 + '</tr>'