diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 7947951..8c4b025 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -268,31 +268,34 @@ invitation.send=Send an invitation
 
 #ConflictList
 ConflictList.list1=Members of the conference
-ConflictList.list2=ConflictList of the article
-ConflictList.choose=manage the conflict list of the conference's articles 
-ConflictList.help=Click to an article to edit the conflict list
+ConflictList.list2=Members you have excluded
+ConflictList.choose=Manage the conflict list 
+ConflictList.help=Click on an article to edit the conflict list
 
 #DispatchMembers
 members.list1=Members of the conference
-members.list2=Members associate to the article
+members.list2=Members you have associated
 dipatchArticle.description=Article's description
-dipatchArticle.choose=Dispatch the articles between the members
-disptachArticle.help=Click to an article to dispatch the members
+dipatchArticle.choose=Dispatch the articles amongst the members
+disptachArticle.help=Click on an article to dispatch it to the members
 
 #DelegateArticles
-delegateArticles.choose=delegate the articles between to the referees
-delegateArticles.list1= referees of the conference
-delegateArticles.list2= referees associated to this article
-delegateArticles.help=Click to an article to delegate it to the referees
+delegateArticles.choose=Delegate the articles amongst the referees
+delegateArticles.list1= Referees of the conference
+delegateArticles.list2= Referees you have associated
+delegateArticles.help=Click on an article to delegate it to the referees
 
 #valider les articles 
-validate.download=download the article
+validate.download=Download the article
 validate.report=View the result of the evaluation
 validate.validate=Validate
 validate.reject=Reject
 
+#forum validation
+forum.validation=You must write a message
+
 #report des evaluations
-report.headPage=Here is the list of the evaluation
+report.headPage=Report's list
 report.referee=Evaluated by 
 
 #detail d'un article
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
index 153a4c1..19abd81 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
@@ -63,8 +63,5 @@
 	</table>
 </form:form>
 
-<br />
-<a href="<c:url value="main.htm"/>">Home</a>
-
 </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
index 28e0871..db0eafe 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
@@ -77,9 +77,6 @@
 	</table>
 </form:form>
 
-<br />
-<a href="<c:url value="main.htm"/>">Home</a>
-
 </body>
 </html>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
index 0fbc0fe..e48ebf7 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
@@ -62,7 +62,5 @@
 	</table>
 </form:form>
 
-<a href="<c:url value="main.htm"/>">Home</a>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
index d129227..4787a17 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
@@ -171,7 +171,20 @@ var CritereManager = Class.create({
 	<c:otherwise>
 		<fmt:message key="conference.titleAdd" />
 	</c:otherwise>
-</c:choose></h4>
+</c:choose></h4>
+
+<c:choose>
+<c:when test="${currentConference != null and currentConference.currentPhase != 'CALL_FOR_PAPER'}">
+	<div class="warningBox">
+		Sorry, you can't modify anymore this part of the conference because the call for paper is already over.
+	</div>
+	
+	<form:form commandName="formConference">
+		<input type="submit" name="_target2" value="Back">
+		<input type="submit" name="_target4" value="Next" />
+	</form:form>
+</c:when>
+<c:otherwise>
 
 <fmt:message key="step">
 	<fmt:param value="4" />
@@ -272,9 +285,9 @@ var CritereManager = Class.create({
 
 <script type="text/javascript">
 	init();
-</script>
-
-<a href="<c:url value="main.htm"/>">Home</a>
+</script>
+</c:otherwise>
+</c:choose>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
index 84c1c2f..6099bd2 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
@@ -117,100 +117,109 @@ function filterUser(el, value) {
 	<c:otherwise>
 		<fmt:message key="conference.titleAdd" />
 	</c:otherwise>
-</c:choose></h4>
-
-<fmt:message key="step">
-	<fmt:param value="5" />
-	<fmt:param value="5" />
-</fmt:message>
-
-<p class="formHelp"><fmt:message key="conference.help.step5" /></p>
-
-<form:form commandName="formConference">
-	<table>
-		<tbody>
-			<tr>
-				<td class="formLabel"><img alt="<fmt:message key="conference5.findUsers" />" src="./images/search.png"/>
-				</td>
-				<td><form:input id="myfilter" path="myfilter" /> <br />
-				<br />
-				<table border="1" id="tableName" style="display: none;">
-					<thead>
-						<tr>
-							<th>Name</th>
-							<th>Actions</th>
-						</tr>
-					</thead>
-					<tbody id="personbody">
-						<tr id="pattern" style="display: none;">
-							<td><span id="tablePerson">Person</span></td>
-							<td><a id="addNew" href="#" onclick="addPerson(this.id)">Add</a>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-				</td>
-			</tr>
-			<tr>
-				<td class="formLabel"><fmt:message key="conference5.usersList" />
-				</td>
-				<td><br />
-				<table border="1" id="tableNameAdded" style="display: none;">
-					<thead>
-						<tr>
-							<th>Name</th>
-							<th>Actions</th>
-						</tr>
-					</thead>
-					<tbody id="personbodyadded">
-						<tr id="patternadded" style="display: none;">
-							<td><span id="tablePersonadded">Person</span></td>
-							<td><a id="supprPerson" href="#"
-								onclick="deletePerson(this.id)">Remove</a></td>
-						</tr>
-					</tbody>
-				</table>
-				</td>
-			</tr>
-			<tr>
-				<td class="formLabel"><fmt:message
-					key="conference5.invitation.send" /></td>
-				<td><input id="emailAddress" type="text" /> <input
-					type="button" name="inviteButton" id="inviteButton" value="Invite" />
-				</td>
-			</tr>
-			<tr>
-				<td class="formLabel"><fmt:message
-					key="conference5.invitationList" /></td>
-				<td>
-				<div id="invitationList" class="dynamicList">
-				<div class="dynamicListHeader"><fmt:message
-					key="form.addConference.invitationsHeader" /></div>
-				</div>
-				<input type="button" id="removeInvitationButton"
-					name="removeInvitation"
-					value="<fmt:message key="button.removeSelected" />" /> <br />
-				</td>
-			</tr>
-		</tbody>
-		<tfoot>
-			<tr>
-				<td>&nbsp;</td>
-				<td><input type="submit" name="_target3" value="Back">
-				<input type="submit" name="_finish" value="Finish" /></td>
-			</tr>
-		</tfoot>
-	</table>
-
-</form:form>
-
-<script type="text/javascript">
-	init();
-</script>
-
-<br />
-<br />
-<a href="<c:url value="main.htm"/>">Home</a>
+</c:choose></h4>
+
+<c:choose>
+<c:when test="${currentConference != null and currentConference.currentPhase != 'CALL_FOR_PAPER'}">
+	<div class="warningBox">
+		Sorry, you can't modify anymore this part of the conference because the call for paper is already over.
+	</div>
+	<form:form commandName="formConference">
+		<input type="submit" name="_target3" value="Back">
+		<input type="submit" name="_finish" value="Finish" />
+	</form:form>
+</c:when>
+<c:otherwise>
+<fmt:message key="step">
+	<fmt:param value="5" />
+	<fmt:param value="5" />
+</fmt:message>
+
+<p class="formHelp"><fmt:message key="conference.help.step5" /></p>
+
+<form:form commandName="formConference">
+	<table>
+		<tbody>
+			<tr>
+				<td class="formLabel"><img alt="<fmt:message key="conference5.findUsers" />" src="./images/search.png"/>
+				</td>
+				<td><form:input id="myfilter" path="myfilter" /> <br />
+				<br />
+				<table border="1" id="tableName" style="display: none;">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Actions</th>
+						</tr>
+					</thead>
+					<tbody id="personbody">
+						<tr id="pattern" style="display: none;">
+							<td><span id="tablePerson">Person</span></td>
+							<td><a id="addNew" href="#" onclick="addPerson(this.id)">Add</a>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="formLabel"><fmt:message key="conference5.usersList" />
+				</td>
+				<td><br />
+				<table border="1" id="tableNameAdded" style="display: none;">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Actions</th>
+						</tr>
+					</thead>
+					<tbody id="personbodyadded">
+						<tr id="patternadded" style="display: none;">
+							<td><span id="tablePersonadded">Person</span></td>
+							<td><a id="supprPerson" href="#"
+								onclick="deletePerson(this.id)">Remove</a></td>
+						</tr>
+					</tbody>
+				</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="formLabel"><fmt:message
+					key="conference5.invitation.send" /></td>
+				<td><input id="emailAddress" type="text" /> <input
+					type="button" name="inviteButton" id="inviteButton" value="Invite" />
+				</td>
+			</tr>
+			<tr>
+				<td class="formLabel"><fmt:message
+					key="conference5.invitationList" /></td>
+				<td>
+				<div id="invitationList" class="dynamicList">
+				<div class="dynamicListHeader"><fmt:message
+					key="form.addConference.invitationsHeader" /></div>
+				</div>
+				<input type="button" id="removeInvitationButton"
+					name="removeInvitation"
+					value="<fmt:message key="button.removeSelected" />" /> <br />
+				</td>
+			</tr>
+		</tbody>
+		<tfoot>
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="submit" name="_target3" value="Back">
+				<input type="submit" name="_finish" value="Finish" /></td>
+			</tr>
+		</tfoot>
+	</table>
+
+</form:form>
+
+<script type="text/javascript">
+	init();
+</script>
+</c:otherwise>
+</c:choose>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp
index 83eaac9..4a2ea67 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp
@@ -170,35 +170,27 @@
 		<div id="title${article.id}" onclick="showDetail(${article.id})">	
 				<table style="width:100%;text-align:center;">
 					<tr>
-						<td><img src="./images/cc-wp-64x64.png"></td>
-						<td>title : ${article.title}
-						<br/>theme: ${article.topic}
-						<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
-
-						<c:if test="${!empty article.secondaryAuthors}">
-							<br/>secondaries authors:
-							<c:forEach var="author" items="${article.secondaryAuthors}">
-								<br/>${author}
-							</c:forEach>
-						</c:if>
+						<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
+						<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
+						
 						</td>
-						<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
+						<td width="20%"><img src="./images/1uparrow.png"></td>
 					</tr>
 				</table>	
 		</div>
 		<div id='dispatcher${article.id}' class="textBox" style="display:none;">
 			<table style="width:100%;"> 
 				<tr><td>
-					<h1><fmt:message key="members.list1"/></h1>
+					<h1><fmt:message key="ConflictList.list1"/></h1>
 					
 					<div id="membersList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">	
 					</div>
 					
 				</td><td>
-					<input type="button" id="addButton" value="add>>>" onclick="addRemote()"/><br/>
-					<input type="button" id="removeButton" value="<<<remove"  onclick="removeRemote()"/>
+					<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
+					<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
 				</td><td>
-					<h1><fmt:message key="members.list2"/></h1>	
+					<h1><fmt:message key="ConflictList.list2"/></h1>	
 							
 					<div id="membersConflictList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">
 					</div>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
index b8f68dc..6e1f7b2 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
@@ -156,19 +156,10 @@
 		<div id="title${article.id}" onclick="showDetail(${article.id})">	
 				<table style="width:100%;text-align:center;">
 					<tr>
-						<td><img src="./images/cc-wp-64x64.png"></td>
-						<td>title : ${article.title}
-						<br/>theme: ${article.topic}
-						<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
-
-						<c:if test="${!empty article.secondaryAuthors}">
-							<br/>secondaries authors:
-							<c:forEach var="author" items="${article.secondaryAuthors}">
-								<br/>${author}
-							</c:forEach>
-						</c:if>
+						<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
+						<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
 						</td>
-						<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
+						<td width="20%"><img src="./images/1uparrow.png"></td>
 					</tr>
 				</table>
 		</div>
@@ -181,8 +172,8 @@
 					</div>
 					
 				</td><td>
-					<input type="button" id="addButton" value="add>>>" onclick="addRemote()"/><br/>
-					<input type="button" id="removeButton" value="<<<remove"  onclick="removeRemote()"/>
+					<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
+					<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
 				</td><td>
 					<h1><fmt:message key="delegateArticles.list2"/></h1>			
 					<div id="refereesArticleList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp
index 559445d..ca239c7 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp
@@ -8,18 +8,24 @@
 <h4 class="title">Article's details</h4>
 
 
-<div id="account_data">
-	<h2>${article.title}</h2>
+<div id="account_data">
+	<p class="legend">Title</p>
+	<fieldset>
+		<div>
+		<label>Title: </label>
+		<span class="content"><b>${article.title}</b></span>
+		</div>
+	</fieldset>
 	
 	<p class="legend">Authors</p>
 	<fieldset>
 		<div>
-			<label>Principal Author :</label>
+			<label>Main Author:</label>
 			<span class="content"><b>${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}</b></span>
 		</div>
-		<c:if test="${article.secondaryAuthors!=null}">
+		<c:if test="${not empty article.secondaryAuthors}">
 		<div>
-			<label>Secondary Authors : </label>
+			<label>Secondary Authors: </label>
 			<ul>
 				<c:forEach items="${article.secondaryAuthors}" var="sAuthor">
 					<li>${sAuthor}</li>
@@ -30,15 +36,25 @@
 	</fieldset>
 	
 	<p class="legend">Topic</p>
-	<fieldset>
-		<label>Topic : </label>
-		<span class="content"><b>${article.topic}</b></span>
+	<fieldset>
+		<div>
+		<label>Topic: </label>
+		<span class="content"><b>${article.topic}</b></span>
+		</div>
+	</fieldset>
+	
+	<p class="legend">Abstract</p>
+	<fieldset>
+		<div>
+		<label>Abstract: </label>
+		<span class="content"><b>${article.abstractText}</b></span>
+		</div>
 	</fieldset>
 	
 	<p class="legend">State</p>
 	<fieldset>
 		<div>
-			<label>State of article : </label>
+			<label>State of article: </label>
 			<span class="content"><b>${article.state}</b></span>
 		</div>
 	</fieldset>
@@ -48,7 +64,9 @@
 <a class="download" href="
 			<c:url value="/download.htm">
 				<c:param name="articleId" value="${article.id}"/>
-			</c:url>">Download</a>
+			</c:url>">Download</a><br /><br />
+<a class="back_link" href="<c:url value="${whereIcome}"/>"><fmt:message
+	key="form.link.back" /></a>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
index f7548a1..93f8147 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
@@ -164,7 +164,7 @@
 </head>
 <body>
 
-<h4 class="title"><fmt:message key="delegateArticles.choose" /></h4>
+<h4 class="title"><fmt:message key="dipatchArticle.choose" /></h4>
 <p class="formHelp">
 	<fmt:message key="disptachArticle.help" />
 </p>
@@ -174,21 +174,13 @@
 		<div id="title${article.id}" onclick="showDetail(${article.id})">	
 			<table style="width:100%;text-align:center;">
 					<tr>
-						<td><img src="./images/cc-wp-64x64.png"></td>
-						<td>title : ${article.title}
-						<br/>theme: ${article.topic}
-						<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
-
-						<c:if test="${!empty article.secondaryAuthors}">
-							<br/>secondaries authors:
-							<c:forEach var="author" items="${article.secondaryAuthors}">
-								<br/>${author}
-							</c:forEach>
-						</c:if>
+						<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
+						<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
+						
 						</td>
-						<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
+						<td width="20%"><img src="./images/1uparrow.png"></td>
 					</tr>
-				</table>	
+				</table>
 		</div>
 		<div id='dispatcher${article.id}' class="textBox" style="display:none;">
 			<table style="width:100%;"> 
@@ -199,8 +191,8 @@
 					</div>
 					
 				</td><td>
-					<input type="button" name="addButton" value="add&gt;&gt;&gt;" onclick="addRemote()"/><br/>
-					<input type="button" name="removeButton" value="&lt;&lt;&lt;remove"  onclick="removeRemote()"/>
+					<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
+					<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
 				</td><td>
 					<h1><fmt:message key="members.list2"/></h1>			
 					<div id="membersArticleList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp
index 2f87ca1..e1b877d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp
@@ -8,19 +8,33 @@
 <h4 class="title">Forum</h4>
 
 
-<table style="width: 100%; border: 1px solid orange;">
+<table style="width: 100%">
 
-	<tr>
-		<th>Article</th>
-		<th>Message's number</th>
+	<tr bgcolor="#FFCE64">
+		<td width="10%" align="center"><b>Details</b></td>
+		<td width="80%" align="center"><b>Articles</b></td>
+		<td width="10%" align="center"><b>Replies</b></td>
 	</tr>
 
-	<c:forEach items="${listArticle}" var="article">
-
-		<tr>
-			<td><a href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><b>${article.title}</b></a></td>
-			<td>?</td>
-		</tr>
+	<c:forEach items="${listArticle}" var="article" varStatus="status">
+		<c:choose>
+			<c:when test="${(status.index%2)==0}">
+				<tr bgcolor="white">
+					<td width="10%" align="center"><a href="<c:url value='detailArticle.htm?id=${article.a.id}'/>"><img src="./images/cc-kghostview-24x24.png"></a></td>
+					<td width="80%" align="center"><a
+						href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.a.id}"/></c:url>"><b>${article.a.title}</b></a></td>
+					<td width="10%" align="center"><b>${article.numberMessage}</b></td>
+				</tr>
+			</c:when>
+			<c:otherwise>
+				<tr bgcolor="#FDF2D8">
+					<td width="10%" align="center"><a href="<c:url value='detailArticle.htm?id=${article.a.id}'/>"><img src="./images/cc-kghostview-24x24.png"></a></td>
+					<td width="80%" align="center"><a
+						href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.a.id}"/></c:url>"><b>${article.a.title}</b></a></td>
+					<td width="10%" align="center"><b>${article.numberMessage}</b></td>
+				</tr>
+			</c:otherwise>
+		</c:choose>
 
 	</c:forEach>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/forumArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/forumArticle.jsp
index db448ac..39a213f 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/forumArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/forumArticle.jsp
@@ -30,7 +30,7 @@
 					<fmt:formatDate value="${message.dateMessage}" dateStyle="short" />
 					</td>
 					<td width="25%" align="center" valign="top">${message.user.firstName} ${message.user.lastName}</td>
-					<td width="60%" align="left"><b>${message.title}</b><br />${message.message}</td>
+					<td width="60%" align="left"><b>${message.title}:</b><br />${message.message}</td>
 					</tr>
 				</c:when>
 				<c:otherwise>
@@ -65,6 +65,7 @@
 	<div>
 		<form:label path="message">Your message</form:label>
 		<form:textarea path="message" cols="60" rows="10" />
+		<span class="formError"><form:errors path="message" /></span>
 	</div>
 </fieldset>
 
@@ -72,6 +73,6 @@
 
 </form:form>
 <br />
-<a href="main.htm" class="back_link"> Main</a>
+<a class="back_link" href="main.htm">Main</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
index b4e8ee2..4f7f843 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
@@ -9,20 +9,9 @@
 
 <c:forEach items="${listArticle}" var="article">
 	<div class="article cbb">
-		<h2>${article.title}</h2>
-		<p>Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></p>
-		<p>
-			<c:if test="${not empty article.secondaryAuthors}">
-			Secondary Authors:
-			<ul>
-				<c:forEach items="${article.secondaryAuthors}" var="sAuthor">
-					<li>${sAuthor}</li>
-				</c:forEach>
-			</ul>
-			</c:if>
-		<p>Topic: <b>${article.topic}</b></p>
+		<h2><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">${article.title}</a> by ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</h2>
 		<p>State: <b>${article.state}</b></p>
-		<p><a href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download</a>
+		<p><a class="download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download</a>
 		</p>
 		<c:if test="${article.state == 'EVALUATED' or article.state == 'REJECTED' or article.state == 'ACCEPTED'}">
 			<p><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message	key="validate.report" /></a></p>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
index 6a9d90d..1e204f3 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
@@ -57,7 +57,7 @@
 
 	<c:choose>
 		<c:when test="${empty listConference}">
-		<div class="errorBox">
+		<div class="warningBox">
 			Sorry, there is no conference at the moment.
 		</div>
 		</c:when>
@@ -73,8 +73,8 @@
 					<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
 						<input id="register" type="checkbox" name="register" value="Register" onchange="ShowRegistered()" checked="checked"> Conference you are registered in<br />
 						<input id="notregister" type="checkbox" name="notregister" value="NotRegister" onchange="ShowNotRegistered()" checked="checked"> Conference you are not registered in<br />
-					</authz:authorize>
-					<input id="ongoing" type="checkbox" name="ongoing" value="Upcoming" onchange="ShowOngoing()" checked="checked"> Only upcoming conferences<br />
+					</authz:authorize>	
+					<input id="ongoing" type="checkbox" name="ongoing" value="Upcoming" onchange="ShowOngoing()"> Only upcoming conferences<br />
 				</td>
 			</tr>
 			</table>
@@ -90,7 +90,7 @@
 					<c:when test="${varName == 'true'}">
 						<c:choose>
 						<c:when test="${conference.currentPhase == 'PAST'}">
-							<div class="conferenceBloc cbb isRegistered confPast" style="display:none;height:0px;width:0px;">
+							<div class="conferenceBloc cbb isRegistered confPast">
 							<h2>
 								${conference.title} - In this conference you are:
 								<c:forEach items="${listRole}" var="role">
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index 14957c4..17f9f35 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -62,25 +62,25 @@
 			<c:choose>
 			<c:when test="${currentConference.typePDF == true or currentConference.typeLatec == true or currentConference.typeWord == true or currentConference.typeODT == true}">
 				<c:if test="${currentConference.typePDF == true}">
-					.pdf&nbsp;
+					<b>.pdf&nbsp;</b>
 				</c:if>
 				<c:if test="${currentConference.typeLatec == true}">
-					.tex&nbsp;
+					<b>.tex&nbsp;</b>
 				</c:if>
 				<c:if test="${currentConference.typeWord == true}">
-					.doc&nbsp;.docx&nbsp;
+					<b>.doc&nbsp;.docx&nbsp;</b>
 				</c:if>
 				<c:if test="${currentConference.typeODT == true}">
-					.odt&nbsp;
+					<b>.odt&nbsp;</b>
 				</c:if>
 			</c:when>
 			<c:otherwise>
-				Any file's type.
+				<b>Any file's type.</b>
 			</c:otherwise>
 			</c:choose>
 			
 			<br /><br />
-			Other informations about the submission: ${currentConference.sendInfo}
+			Other informations about the submission: <b>${currentConference.sendInfo}</b>
 			
 		</div>
 		<br />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
index 6390326..3177e5b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
@@ -56,25 +56,25 @@
 			<c:choose>
 			<c:when test="${conferenceReport.typePDF == true or conferenceReport.typeLatec == true or conferenceReport.typeWord == true or conferenceReport.typeODT == true}">
 				<c:if test="${conferenceReport.typePDF == true}">
-					.pdf&nbsp;
+					<b>.pdf&nbsp;</b>
 				</c:if>
 				<c:if test="${conferenceReport.typeLatec == true}">
-					.tex&nbsp;
+					<b>.tex&nbsp;</b>
 				</c:if>
 				<c:if test="${conferenceReport.typeWord == true}">
-					.doc&nbsp;.docx&nbsp;
+					<b>.doc&nbsp;.docx&nbsp;</b>
 				</c:if>
 				<c:if test="${conferenceReport.typeODT == true}">
-					.odt&nbsp;
+					<b>.odt&nbsp;</b>
 				</c:if>
 			</c:when>
 			<c:otherwise>
-				Any file's type.
+				<b>Any file's type.</b>
 			</c:otherwise>
 			</c:choose>
 			
 			<br /><br />
-			Other informations about the submission: ${conferenceReport.sendInfo}
+			Other informations about the submission: <b>${conferenceReport.sendInfo}</b>
 			
 		</div>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index 1fa9c1c..eea936b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -33,7 +33,7 @@
 <form:form method="post" enctype="multipart/form-data" commandName="submissionArticle" id="account_data">
 
 <p class="legend"><fmt:message key="form.article.information" /></p>
-<p class="formHelp"><fmt:message key="conference.help.step2datelimit" /></p>
+<p class="formHelp"><fmt:message key="conference.help.step2datelimit" /></p><br />
 
 <fieldset>
 	<span class="info"><fmt:message key="form.field.necessary" /></span>
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 69212e7..bd993ed 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -72,6 +72,7 @@
 		class="org.yacos.web.PCmember.controller.ForumController">
 		<property name="articleManager" ref="articleManager" />
 		<property name="userManager" ref="userManager" />
+		<property name="messageManager" ref="messageManager" />
 	</bean>
 	
 	<bean id="ForumArticleController"
@@ -82,6 +83,11 @@
 		<property name="formView" value="forumArticle" />
 		<property name="messageManager" ref="messageManager" />
 		<property name="articleManager" ref="articleManager" />
+		<property name="validator" ref="ForumValidator"/>
+	</bean>
+	
+	<bean id="ForumValidator"
+		class="org.yacos.web.PCmember.validation.ForumArticleValidator">
 	</bean>
 	
 	<bean id="AdminController"
diff --git a/YACOSWeb/WebContent/images/1downarrow.png b/YACOSWeb/WebContent/images/1downarrow.png
new file mode 100644
index 0000000..5900529
Binary files /dev/null and b/YACOSWeb/WebContent/images/1downarrow.png differ
diff --git a/YACOSWeb/WebContent/images/1uparrow.png b/YACOSWeb/WebContent/images/1uparrow.png
new file mode 100644
index 0000000..eb10f6c
Binary files /dev/null and b/YACOSWeb/WebContent/images/1uparrow.png differ
diff --git a/YACOSWeb/WebContent/images/Thumbs.db b/YACOSWeb/WebContent/images/Thumbs.db
deleted file mode 100644
index 33c1257..0000000
Binary files a/YACOSWeb/WebContent/images/Thumbs.db and /dev/null differ
diff --git a/YACOSWeb/WebContent/images/agt_back.png b/YACOSWeb/WebContent/images/agt_back.png
new file mode 100644
index 0000000..78dcc70
Binary files /dev/null and b/YACOSWeb/WebContent/images/agt_back.png differ
diff --git a/YACOSWeb/WebContent/images/agt_forward.png b/YACOSWeb/WebContent/images/agt_forward.png
new file mode 100644
index 0000000..a7d90d5
Binary files /dev/null and b/YACOSWeb/WebContent/images/agt_forward.png differ
diff --git a/YACOSWeb/WebContent/images/cc-kghostview-24x24.png b/YACOSWeb/WebContent/images/cc-kghostview-24x24.png
new file mode 100644
index 0000000..767c5d8
Binary files /dev/null and b/YACOSWeb/WebContent/images/cc-kghostview-24x24.png differ
diff --git a/YACOSWeb/WebContent/images/cc-wp-24x24.png b/YACOSWeb/WebContent/images/cc-wp-24x24.png
new file mode 100644
index 0000000..45e888a
Binary files /dev/null and b/YACOSWeb/WebContent/images/cc-wp-24x24.png differ
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationRemoveController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationRemoveController.java
index 1769ff5..e6ba917 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationRemoveController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationRemoveController.java
@@ -10,6 +10,7 @@ import org.springframework.web.servlet.mvc.Controller;
 import org.springframework.web.servlet.view.RedirectView;
 import org.yacos.core.article.Article;
 import org.yacos.core.article.IArticleManager;
+import org.yacos.core.article.Article.State;
 import org.yacos.core.evaluation.IEvaluationManager;
 import org.yacos.core.evaluation.Rating;
 import org.yacos.core.evaluation.Report;
@@ -53,6 +54,12 @@ public class EvaluationRemoveController implements Controller {
 			if (rpt == null)
 				throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 			
+			List<Report> listReport = evaluationManager.getReportsForArticle(article.getId());
+			if (listReport.size() <= 1) {
+				article.setState(State.SUBMITED);
+				articleManager.updateArticle(article);
+			}
+				
 			List<Rating> listRating = evaluationManager.getRatingForReport(rpt.getId());
 			
 			for (Rating rt : listRating) {
@@ -66,8 +73,14 @@ public class EvaluationRemoveController implements Controller {
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 		}
 
-			// TODO : mettre le bon lien ici
-		return new ModelAndView(new RedirectView("listEvaluation.htm"));
+		String addr = request.getHeader("REFERER");
+		
+		if (addr.toLowerCase().contains("role=pcmember"))
+			return new ModelAndView(new RedirectView("listEvaluation.htm?role=pcmember"));
+		else if (addr.toLowerCase().contains("role=referee"))
+			return new ModelAndView(new RedirectView("listEvaluation.htm?role=referee"));
+		else 
+			throw new ModelAndViewDefiningException(new ModelAndView("denied"));
 	}
 
 }
\ No newline at end of file
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumArticleController.java
index 342371a..9fae811 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumArticleController.java
@@ -1,11 +1,15 @@
 package org.yacos.web.PCmember.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.validation.BindException;
+import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndViewDefiningException;
 import org.springframework.web.servlet.mvc.SimpleFormController;
@@ -47,6 +51,19 @@ public class ForumArticleController extends SimpleFormController {
 		
 		logger.info("Returning message view");
 
+		FormArticleMessage fam = new FormArticleMessage();
+		
+		return fam;
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Map referenceData(HttpServletRequest request, Object command,
+			Errors errors) throws Exception {
+		
+		Map<String, Object> model = new HashMap<String, Object>();
+		
 		String articleId = request.getParameter("articleId");
 
 		try {
@@ -58,11 +75,10 @@ public class ForumArticleController extends SimpleFormController {
 
 			List<Message> listMessage = messageManager.getMessagesForArticle(id);
 			
-			request.getSession().setAttribute("listMessage", listMessage);
+			model.put("listMessage", listMessage);
 			
-			FormArticleMessage fam = new FormArticleMessage();
+			return model;
 			
-			return fam;
 		}
 		catch (NumberFormatException e) {
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumController.java
index 34d0e95..0706316 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ForumController.java
@@ -3,11 +3,9 @@ package org.yacos.web.PCmember.controller;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.servlet.ModelAndView;
@@ -17,8 +15,10 @@ import org.yacos.core.article.Article;
 import org.yacos.core.article.IArticleManager;
 import org.yacos.core.conferences.Conference;
 import org.yacos.core.exceptions.ConferenceDoesntExistException;
+import org.yacos.core.forum.IMessageManager;
 import org.yacos.core.users.IUserManager;
 import org.yacos.core.users.Role.RoleType;
+import org.yacos.web.PCmember.form.ArticleForumBean;
 import org.yacos.web.system.controller.NoConferenceSelectedException;
 import org.yacos.web.system.session.SessionService;
 
@@ -27,7 +27,16 @@ public class ForumController extends SimpleFormController {
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private IArticleManager articleManager;
+	private IMessageManager messageManager;
 	private IUserManager userManager;
+	
+	public IMessageManager getMessageManager() {
+		return messageManager;
+	}
+
+	public void setMessageManager(IMessageManager messageManager) {
+		this.messageManager = messageManager;
+	}
 
 	public IArticleManager getArticleManager() {
 		return articleManager;
@@ -55,24 +64,44 @@ public class ForumController extends SimpleFormController {
 
 		String person = request.getParameter("role");
 		
-		if(person == null){
+		if(person == null || person.equals("")){
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 		}
+		
+		List<ArticleForumBean> listArticleBean = new ArrayList<ArticleForumBean>();
+		
 		if (person.equals("pcmember")) {
 			if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, conf.getId())) {
 				listArticle = articleManager.getArticlesOfMember(conf.getId(), SessionService.getInstance().getCurrentUserLogin());
+				
+				for (Article a : listArticle) {
+					ArticleForumBean afb = new ArticleForumBean();
+					afb.setA(a);
+					afb.setNumberMessage(messageManager.getMessagesForArticle(a.getId()).size());
+					listArticleBean.add(afb);
+				}
 			}
+			else
+				throw new ModelAndViewDefiningException(new ModelAndView("denied"));
 		}
 		else if (person.equals("chairman")) {
 			if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.CHAIRMAN, conf.getId())) {
 				listArticle = articleManager.getArticles(conf.getId());
+				
+				for (Article a : listArticle) {
+					ArticleForumBean afb = new ArticleForumBean();
+					afb.setA(a);
+					afb.setNumberMessage(messageManager.getMessagesForArticle(a.getId()).size());
+					listArticleBean.add(afb);
+				}
 			}
+			else
+				throw new ModelAndViewDefiningException(new ModelAndView("denied"));
 		}
 		else
 			throw new ModelAndViewDefiningException(new ModelAndView("denied"));
 
 
-		return new ModelAndView("forum", "listArticle", listArticle);
+		return new ModelAndView("forum", "listArticle", listArticleBean);
 	}
-
 }
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/ArticleForumBean.java b/YACOSWeb/src/org/yacos/web/PCmember/form/ArticleForumBean.java
new file mode 100644
index 0000000..8153fb6
--- /dev/null
+++ b/YACOSWeb/src/org/yacos/web/PCmember/form/ArticleForumBean.java
@@ -0,0 +1,23 @@
+package org.yacos.web.PCmember.form;
+
+import org.yacos.core.article.Article;
+
+public class ArticleForumBean {
+	
+	private Article a;
+	private Integer numberMessage;
+	
+	public Article getA() {
+		return a;
+	}
+	public void setA(Article a) {
+		this.a = a;
+	}
+	public Integer getNumberMessage() {
+		return numberMessage;
+	}
+	public void setNumberMessage(Integer numberMessage) {
+		this.numberMessage = numberMessage;
+	}
+
+}
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/validation/ForumArticleValidator.java b/YACOSWeb/src/org/yacos/web/PCmember/validation/ForumArticleValidator.java
new file mode 100644
index 0000000..539de4b
--- /dev/null
+++ b/YACOSWeb/src/org/yacos/web/PCmember/validation/ForumArticleValidator.java
@@ -0,0 +1,18 @@
+package org.yacos.web.PCmember.validation;
+
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+import org.yacos.web.PCmember.form.FormArticleMessage;
+
+public class ForumArticleValidator implements Validator {
+	
+	@SuppressWarnings("unchecked")
+	public boolean supports(Class commandClass) {
+		return commandClass.isAssignableFrom(FormArticleMessage.class);
+	}
+
+	public void validate(Object commandObject, Errors errors) {		
+		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "message", "forum.validation");
+	}
+}
diff --git a/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java
index 809ca2b..536a0d5 100644
--- a/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/author/controller/DetailArticleController.java
@@ -1,6 +1,8 @@
 package org.yacos.web.author.controller;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -34,7 +36,12 @@ public class DetailArticleController extends SimpleFormController {
 			if (article == null)
 				throw new ModelAndViewDefiningException(new ModelAndView("404error"));
 
-			return new ModelAndView("detailArticle", "article", article);
+			Map <String, Object> model = new HashMap<String, Object>();
+			
+			model.put("whereIcome", request.getHeader("REFERER"));
+			model.put("article", article);
+			
+			return new ModelAndView("detailArticle", model);
 		}
 		catch (NumberFormatException e) {
 			throw new ModelAndViewDefiningException(new ModelAndView("404error"));
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
index 8a4124f..690aae5 100644
--- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
@@ -21,6 +21,7 @@ import org.springframework.web.servlet.mvc.AbstractWizardFormController;
 import org.springframework.web.servlet.view.RedirectView;
 import org.yacos.core.conferences.Conference;
 import org.yacos.core.conferences.IConferenceManager;
+import org.yacos.core.conferences.Conference.Phase;
 import org.yacos.core.evaluation.Criterion;
 import org.yacos.core.evaluation.IEvaluationManager;
 import org.yacos.core.exceptions.ConferenceDoesntExistException;
@@ -240,7 +241,7 @@ public class AddConferenceController extends AbstractWizardFormController {
 		setCommandName("formConference");
 		setPages(new String[] {"addConference", "addConference2", "addConference3", "addConference4", "addConference5"});
 	}
-	
+
 	protected Object formBackingObject(HttpServletRequest request) throws ModelAndViewDefiningException {
 		logger.info(this.getClass().toString() + " dans le formBackingObject");
 
@@ -476,7 +477,7 @@ public class AddConferenceController extends AbstractWizardFormController {
 			mailBody += "You've been invited to join the program comity of the conference :\n";
 			mailBody += conf.getTitle()+"/n";
 			mailBody += "You can register on this page : \n";
-			mailBody += YACOSUtils.fullURL("registerUser.htm")+" /n";
+			mailBody += YACOSUtils.fullURL("registerUser.htm")+" \n";
 			mailBody += "Please note that you MUST use this eMail address in the registration form in order to get the appropriate credentials.";
 			// TODO : use a template
 			for(String invitationEmail : listInvitations){
@@ -514,22 +515,25 @@ public class AddConferenceController extends AbstractWizardFormController {
 
 			conferenceManager.update(conf);
 
-			conferenceManager.removeCriterionToConference(conf.getId());
+			if (conf.getCurrentPhase() == Phase.CALL_FOR_PAPER) {
 
-			for(CriterionBean criterion : criteria){
-				conferenceManager.addCriterionToConference(
-						conf.getId(),
-						criterion.getLabel(),
-						criterion.getMin(),
-						criterion.getMax());
-			}
+				conferenceManager.removeCriterionToConference(conf.getId());
 
-			conferenceManager.removePCMemberForConf(conf.getId());
+				for(CriterionBean criterion : criteria){
+					conferenceManager.addCriterionToConference(
+							conf.getId(),
+							criterion.getLabel(),
+							criterion.getMin(),
+							criterion.getMax());
+				}
 
-			for(PersonBean personBean : listPersonAdded){
-				conferenceManager.addPCMemberToConference(
-						conf.getId(),
-						personBean.getLogin());
+				conferenceManager.removePCMemberForConf(conf.getId());
+
+				for(PersonBean personBean : listPersonAdded){
+					conferenceManager.addPCMemberToConference(
+							conf.getId(),
+							personBean.getLogin());
+				}
 			}
 		}