diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/empty.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/empty.jsp
index bcf8158..8304cc9 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/empty.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/empty.jsp
@@ -1,4 +1,3 @@
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> 
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
 
 <decorator:body />
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp
index a55c1a2..e063325 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/footer.jsp
@@ -1 +1,11 @@
-<h1>C'est le footer</h1>
\ No newline at end of file
+<html>
+<head></head>
+<body>
+
+<!-- Footer with credits -->
+<div id="globalfooter">
+	Copyright Yacos Team 2008
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp
new file mode 100644
index 0000000..eb94d3e
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/headermainchoice.jsp
@@ -0,0 +1,30 @@
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+<html>
+<head></head>
+<body>
+
+<!-- containerheader -->
+<div id="containerheader">
+	<div id="leftdescription">
+		<p>Application pour gérer les conférences. Outil libre dans le programme universitaire</p>
+	</div>
+	
+	<div id="rightchoice">
+		
+		<c:choose>
+			<c:when test="${idCurrentConference!=null}">
+				La conférence courante est : ${idCurrentConference}.<br />
+				<a href="<c:url value="listConference.htm"/>"><fmt:message key="conference.linkMenu.change" /></a>
+			</c:when>
+			<c:otherwise>
+    			Il n'y a pas de conférence courante.<br />
+    			<a href="<c:url value="listConference.htm"/>"><fmt:message key="conference.linkMenu.choose" /></a>
+			</c:otherwise>
+		</c:choose>
+		
+	</div>
+</div><!--containerheader-->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp
new file mode 100644
index 0000000..a22f599
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/headermenu.jsp
@@ -0,0 +1,15 @@
+<html>
+<head></head>
+<body>
+
+<!-- Globar bar navigation -->
+<div id="globalheader">
+	<ul id="globalnav">
+		<li><a href="#">HOME</a></li>
+		<li><a href="#">INFOS</a></li>
+		<li><a href="#">POST</a></li>
+	</ul>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp
new file mode 100644
index 0000000..370bba3
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp
@@ -0,0 +1,3 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
index 682ffc7..336625c 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
@@ -1,20 +1,44 @@
 <!-- Include -->
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> 
-<%@ taglib uri="http://www.opensymphony.com/sitemesh/page" prefix="page" %>
+<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> 
+<%@ taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
 <!-- Doctype -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
 	<head>
-		<title><decorator:title default="YACOS" /></title>
+		<title><fmt:message key="title" /></title>
+		<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
 		<decorator:head />
 	</head>
+	
 	<body>
-		BODY de la page décorée :
-		<decorator:body />
-		/BODY de la page décorée
+	
+		<!-- headermenu -->
+		<div><page:applyDecorator name="empty" page="/WEB-INF/decorators/headermenu.jsp" /></div>
+	
+		<!-- Main bloc -->
+		<div id="container">
 		
+			<!-- main header with choice conference -->
+			<page:applyDecorator name="empty" page="/WEB-INF/decorators/headermainchoice.jsp" />
+			
+			<div id="main">
+			
+				<!-- dynamic menu with session -->
+				<page:applyDecorator name="empty" page="/WEB-INF/decorators/usermenu.jsp" />
+				
+				<div id="maincontent">
+				
+					<!--  Contents of decorated page -->
+					<decorator:body />
+					
+				</div><!--maincontent-->
+			</div><!--main-->
+		</div><!--container-->
+
+		<!-- footer -->
 		<div><page:applyDecorator name="empty" page="/WEB-INF/decorators/footer.jsp" /></div>
 		
 	</body>
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
new file mode 100644
index 0000000..5c4094a
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -0,0 +1,30 @@
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+<html>
+<head></head>
+<body>
+
+<div id="mainmenu">
+	<div id="mainmenubloc">
+		<h4>Bloc 1</h4>
+			<ul>
+				<li><a href="<c:url value="listArticle.htm"/>"><fmt:message key="listarticle.title" /></a></li>
+				<li><a href="<c:url value="submissionArticle.htm"/>"><fmt:message key="submission.title" /></a></li>
+				<li><a href="<c:url value="choosePreference.htm"/>"><fmt:message key="preference.title" /></a></li>
+				<li><a href="<c:url value="dispatchArticle.htm"/>"><fmt:message key="dispatch.title" /></a></li>
+				<li><a href="<c:url value="addConference.htm"/>"><fmt:message key="conference.titleMenu" /></a></li>
+			</ul>
+	</div>
+	
+	<div id="mainmenubloc">
+		<h4>Bloc 2</h4>
+			<ul>
+				<li><a href="#">Lien 1</a></li>
+				<li><a href="#">Lien 2</a></li>
+				<li><a href="#">Lien 3</a></li>
+			</ul>
+	</div>
+</div><!--mainmenu-->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
index dc80659..214de97 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
@@ -1,25 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
-
 <h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
 
 <form:form commandName="formConference" name="monForm">
@@ -28,15 +12,12 @@
 	<fmt:message key="conference.description" />  <textarea name="description"></textarea> <br/><br />
 	<fmt:message key="conference.otherInformations" />  <textarea name="otherInformations"></textarea> <br/><br />
 	
-	<input type="submit" alignment="center" name="_target1" value="Next" />	
+	<input type="submit" align="middle" name="_target1" value="Next" />	
 
 </form:form> 
 
 <br />
-<a href="<c:url value="main.htm"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<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 2606d36..6a33a8f 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
@@ -1,26 +1,12 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
 <link rel="stylesheet" href="./stylesheets/calendar.css" type="text/css" />
 <script src="./stylesheets/calendar.js"></script>
-
-
-
 </head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
 
 <h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
 
@@ -40,10 +26,7 @@
 </form:form> 
 
 <br />
-<a href="<c:url value="main.htm"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<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 673a627..de2e0fa 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
@@ -1,24 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
 
 <h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
 
@@ -42,14 +27,11 @@
 
 	<br />
 	<br />
-	<input type="submit" alignment="center" name="_target1" value="Back">
-	<input type="submit" alignment="center" name="_target3" value="Next" />
+	<input type="submit" align="middle" name="_target1" value="Back">
+	<input type="submit" align="middle" name="_target3" value="Next" />
 
 </form:form> <br />
-<a href="<c:url value="main.htm"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<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 5f33937..978231d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
@@ -1,22 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
 
 <h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
 
@@ -30,15 +17,12 @@
 
 	<br /><br />
 
-	<input type="submit" alignment="center" name="_target2" value="Back">
-	<input type="submit" alignment="center" name="_target4" value="Next" />
+	<input type="submit" align="middle" name="_target2" value="Back">
+	<input type="submit" align="middle" name="_target4" value="Next" />
 	
 
 </form:form> <br />
-<a href="<c:url value="main.htm"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<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/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
index 7e7a635..9203d0b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
@@ -1,22 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
 
 <h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
 
@@ -24,16 +11,13 @@
 
 	<br /> Page 5
 	
-	<input type="submit" alignment="center" name="_finish" value="Next" />
-	<input type="submit" alignment="center" name="_target3" value="Back">
+	<input type="submit" align="middle" name="_finish" value="Next" />
+	<input type="submit" align="middle" name="_target3" value="Back">
 
 </form:form> 
 
 <br />
-<a href="<c:url value="main.htm"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<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/choosePreference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
index 4a71205..5408f4b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreference.jsp
@@ -1,24 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<!-- 
-<%@ page session="false" %> spring -> true par defaut
--->
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
-
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
+
 
 <h2 align="center"><fmt:message key="preference.title" /></h2>
 
@@ -51,10 +36,5 @@
 <a href="<c:url value="main.htm"/>">Home</a>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
-
   </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
index dc3c321..3053491 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/choosePreferenceOK.jsp
@@ -1,31 +1,15 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
 
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
+
 
 <fmt:message key="preference.ok"/>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
 
   </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 d6d6d8a..b42e5d5 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
@@ -1,23 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
 <table>
 	<tr>
 		<th>articles to dispatch</th><th>members</th><th>members associate to the article</th>
@@ -62,11 +48,6 @@
 	 </table>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
-
   </body>
 </html>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
index 460cdbd..d91d7d9 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
@@ -1,20 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+<html>
+<head></head>
+<body>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
-<body>
-
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
 <c:forEach items="${listArticle}" var="article">
 	<ul class="article">
 		<li class="title">${article.title}</li>
@@ -23,10 +12,7 @@
 		<li class="article_url"><a href="<c:url value="${article.URL_article}"/>">Download the article</a></li>
 	</ul>
 </c:forEach>
-</div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+
 
 </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
index 538fd32..bf506d0 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
@@ -1,24 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><fmt:message key="title" /></title>
-<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-
-<div class="mainBloc">
-<div class="header">&nbsp;</div>
-<div class="content"><jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
-
 <h2 align="center">Choose a conference</h2>
 
 	Choix de la conference	<br /><br />	
@@ -53,10 +38,7 @@
 	<br />
 
 
-<a href="<c:url value="main"/>">Home</a></div>
-</div>
-<div class="footer">&nbsp;</div>
-</div>
+<a href="<c:url value="main"/>">Home</a>
 
 </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index bb34780..104cb2b 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -1,31 +1,13 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
+Page d'accueil à changer de place (controller dans system et non dans author)
+Si conf active : page d'intro de la conf
+si pas de conf active : page d'intro du site (visiteur)
 
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
-   Main Page
-
-
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
index 872e9de..f3b6ae8 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
@@ -1,27 +1,9 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
- 
 <h2><fmt:message key="register.title" /></h2>
 <form:form method="post" commandName="registerUser">
 
@@ -46,10 +28,5 @@
 <a href="<c:url value="main.htm"/>">Home</a>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
-
   </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index b74fb46..18e1e87 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -1,12 +1,7 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
 	<script language="JavaScript">
 function Ajouter(form) {
 		var o=new Option(form.secondaryauthor.value);
@@ -20,17 +15,7 @@ function Supprimer(form) {
 </head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
 
-
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
- 
 <h2 align="center"><fmt:message key="submission.title" /></h2>
 <form:form method="post" enctype="multipart/form-data" commandName="submissionArticle">
 
@@ -69,10 +54,5 @@ function Supprimer(form) {
 <a href="<c:url value="main.htm"/>">Home</a>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
-
   </body>
 </html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
index cbf6175..d18ae40 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
@@ -1,35 +1,14 @@
-<%@ include file="/WEB-INF/jsp/include.jsp"%>
-<%@ page session="false" %>
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-	<title><fmt:message key="title"/></title>
-	<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
-</head>
+<head></head>
 <body>
 
-<jsp:include page="/WEB-INF/jsp/header.jsp" />
-
-	<div class="mainBloc">
-		<div class="header">&nbsp;</div>
-		<div class="content">
-		
-<jsp:include page="/WEB-INF/jsp/menu.jsp" />
-<div id="main_content">
-
- 
 Soumission OK
 <br />
 
 <a href="<c:url value="main.htm"/>">Home</a>
 
 
-</div>
-</div>
-	<div class="footer">&nbsp;</div>
-</div>
-
   </body>
 </html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/images/background-repeat.png b/YACOSWeb/WebContent/images/background-repeat.png
new file mode 100644
index 0000000..1d37a83
Binary files /dev/null and b/YACOSWeb/WebContent/images/background-repeat.png differ
diff --git a/YACOSWeb/WebContent/index.jsp b/YACOSWeb/WebContent/index.jsp
index e5d65cc..8fd0507 100644
--- a/YACOSWeb/WebContent/index.jsp
+++ b/YACOSWeb/WebContent/index.jsp
@@ -1,4 +1,4 @@
-<%@ include file="/WEB-INF/jsp/include.jsp" %>
+<%@ include file="/WEB-INF/decorators/include.jsp" %>
 
 <%-- Redirected because we can't set the welcome page to a virtual URL. --%>
 <c:redirect url="/main.htm"/>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index 7263653..99fd27c 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -1,156 +1,159 @@
+/* @group RESET */
+
+html,body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,pre,form,p,blockquote,fieldset,input { margin: 0; padding: 0; }
+h1,h2,h3,h4,h5,h6,pre,code,address,caption,cite,code,em,strong,th { font-size: 1em; font-weight: normal; font-style: normal; }
+ul,ol { list-style: none; }
+fieldset,img { border: none; }
+caption,th { text-align: left; }
+table { border-collapse: collapse; border-spacing: 0; }
+
+/* @end */
+
 body {
-	background: url(../images/background.png) repeat-x fixed;
-	font: 11px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif;
-	padding-top: 0px;
-	margin-top: 0px;
+	color:#333;
+	font: 12px/18px "Ludida Grande", Geneva, Arial, Verdana, sans-serif;
+	background: #fff url(images/background-repeat.png) repeat-x scroll left top;
 }
 
-/* @group headerBloc */
-.headerBloc {
-	width: 818px;
-	margin-left: auto;
-	margin-right: auto;
+/* @group globalHeader */
+
+#globalheader {
+	width: 980px;
+	height: 38px;
+	margin: 18px auto;
+	position: relative;
+	z-index: 9998;
+	background-color: #ceffeb;
+}
+
+#globalheader #globalnav {
+	margin: 0;
+	padding: 0;
+}
+
+#globalheader #globalnav li {
+	display: inline;
+}
+
+#globalheader #globalnav li a {
+	float: left;
+	width: 117px;
+	height: 0;
+	padding-top:10px;
+	padding-right: 0px;
+	background-color: #40ff8f;
+	text-decoration: none;
+	color: #3800ff;
+	font-size: 16px;
+}
+
+/* @end */
+
+#container {
+	width: 980px;
+	margin: 0 auto;
+	position: relative;
+	background-color: #f7fbff;
+}
+
+/* @group containerheader */
+
+#containerheader {
+	background-color: #ff9b9b;
+	padding: 8px;
+	position: relative;
 	height: 70px;
-	margin-bottom: 30px;
+	margin-bottom: 15px;
 }
 
-.headerBloc div.content {
-	background: url(../images/box-content.png) repeat-y left center;
-	padding-right: 25px;
-	padding-left: 25px;
-	height: inherit;
-	display: block;
+#containerheader #leftdescription {
+	width: 280px;
+	background-color: #ff4e47;
+	float: left;
 }
 
-.headerBloc div.footer {
-	background: url(../images/box-footer.png) no-repeat left bottom;
-	height: 22px;
+#containerheader #leftdescription p {
+	font-size: x-small;
 }
 
-
-/* @end */
-
-/* @group mainBloc */
-.mainBloc {
-	width: 818px;
-	margin-left: auto;
-	margin-right: auto;
-	top: 10px;
-	height: 500px;
-}
-
-.mainBloc div.header {
-	background: url(../images/box-header.png) no-repeat left top;
-	height: 22px;
-}
-
-.mainBloc div.content {
-	background: url(../images/box-content.png) repeat-y left center;
-	padding-right: 25px;
-	padding-left: 25px;
-}
-
-.mainBloc div.footer {
-	background: url(../images/box-footer.png) left top;
-	height: 22px;
+#containerheader #rightchoice {
+	background-color: #da1107;
+	margin-left: 300px;
 }
 
 /* @end */
 
-/* @group MiniBloc */
-#menu {
+#main {
+	
+	position: relative;
+	background-color: #8bff74;
+	padding: 15px 0 0;
+	width: 100%;
+	display: table;
+}
+
+#maincontent {
+	padding: 18px 20px;
+	position: relative;
+	color: #333;
+}
+
+/* @group mainmenu */
+
+#main #mainmenu {
+	background-color: #edffe2;
 	width: 150px;
-	padding: 5px 15px 0px 0px;
-	display: table-cell;
+	float: left;
 }
 
-.miniBloc {
-	color: #a1642d;
-	margin-bottom: 10px;
+#main #mainmenu #mainmenubloc {
+	width: 120px;
+	background-color: #ffef9e;
+	margin: 10px auto;
 }
 
-.miniBloc div.header {
-	background: url(../images/minibox-header.png) no-repeat left top;
+#main #mainmenu #mainmenubloc h4 {
+	color: #ff0e00;
 	font-weight: bold;
-	font-size: medium;
-	font-variant: small-caps;
-	text-align: center;
 }
 
-.miniBloc div.content {
-	background: url(../images/minibox-content.png) repeat-y left;
-	padding: 5px;
+#main #mainmenu #mainmenubloc ul {
+	
 }
 
-.miniBloc ul {
-	margin: 0;
-	list-style: none;
-	padding: 0 0 0 5px;
+#main #mainmenu #mainmenubloc ul li {
+	
 }
 
-.miniBloc li {
-	margin: 0;
-	padding: 0 0 2px;
-}
-
-.miniBloc a {
-	text-transform: capitalize;
-	color: #893d00;
+#main #mainmenu #mainmenubloc ul li a {
 	text-decoration: none;
+	color: #007d1b;
 }
 
-.miniBloc a:hover {
-	text-transform: capitalize;
-	color: #ff7a00;
-	text-decoration: none;
-}
-
-.miniBloc div.footer {
-	background: url(../images/minibox-footer.png) no-repeat left top;
+#main #mainmenu #mainmenubloc ul li a:hover {
+	color: #80ff3a;
 }
 
 /* @end */
 
-#main_content {
-	display: table-cell;
-	width: 640px;
-}
-
-.article a {
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
-}
-.article a:hover {
-	text-decoration: underline;
-}
+/* @group maincontent */
 
-ul.article {
-	border-bottom : thin solid #666;
-	padding-bottom: 5px;
+#main #maincontent {
+	background-color: #f5e5ff;
+	margin-left: 160px;
 }
 
-ul.article li {
-	list-style: none;
+/* @end */
+
+/* @group globalfooter */
+
+#globalfooter {
+	width: 980px;
+	height: 38px;
+	margin: 18px auto;
+	position: relative;
+	z-index: 9998;
+	background-color: #ff7eff;
 }
 
-ul.article .title {
-	font-size: large;
-}
-
-ul.article .author {
-	font-size: small;
-}
-
-ul.article .topic {
-	font-size: small;
-}
-
-ul.article .article_url {
-	font-size: small;
-}
-
-.conferenceBloc {
-	background-color: #FFE591;
-	padding: 5px;
-}
\ No newline at end of file
+/* @end */
