diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
index 73e6b1e..d479402 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
@@ -8,6 +8,7 @@
 
 <html>
 	<head>
+		<link rel="icon" type="image/png" href="./images/favicon.png" />
 		<title><fmt:message key="title" /></title>
 		<link rel="stylesheet" href="./stylesheets/base.css" type="text/css" />
 		<decorator:head />
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/errors/403error.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/errors/403error.jsp
new file mode 100644
index 0000000..a96909b
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/errors/403error.jsp
@@ -0,0 +1,10 @@
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+<html>
+<head></head>
+<body>
+
+File doesn't exist.
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
new file mode 100644
index 0000000..00031c1
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/errors/404error.jsp
@@ -0,0 +1,10 @@
+<%@ include file="/WEB-INF/decorators/include.jsp"%>
+
+<html>
+<head></head>
+<body>
+
+Error : page not found
+
+</body>
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
index 5cf6f42..28e468d 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp
@@ -30,9 +30,13 @@
 
   </table>
 </form>
- <authz:authentication operation="username"></authz:authentication>
-<authz:authorize ifAllGranted="ROLE_AUTHOR"> 
 
+<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
+	<a href="j_acegi_logout">Logout</a>
+</authz:authorize>
+
+
+<authz:authorize ifAllGranted="ROLE_AUTHOR"> 
  <h1>Welcome: <%= SecurityContextHolder.getContext().getAuthentication().getName() %></h1> 
  </authz:authorize>
 
diff --git a/YACOSWeb/WebContent/WEB-INF/web.xml b/YACOSWeb/WebContent/WEB-INF/web.xml
index f0e36e3..dfe6267 100644
--- a/YACOSWeb/WebContent/WEB-INF/web.xml
+++ b/YACOSWeb/WebContent/WEB-INF/web.xml
@@ -42,20 +42,6 @@
         <filter-name>lazyLoadingFilter</filter-name>
         <filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
     </filter>
-    
-	<!-- SiteMesh Integration declaration Start -->
-	<filter>
-		<filter-name>sitemesh</filter-name>
-		<filter-class>
-			com.opensymphony.module.sitemesh.filter.PageFilter
-		</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>sitemesh</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<!-- SiteMesh Integration declaration End -->
 	
 	<!-- Acegi Security declaration Start -->
 	<filter>
@@ -72,6 +58,21 @@
   		<url-pattern>/*</url-pattern>
   </filter-mapping>
   
+  
+	<!-- SiteMesh Integration declaration Start -->
+	<filter>
+		<filter-name>sitemesh</filter-name>
+		<filter-class>
+			com.opensymphony.module.sitemesh.filter.PageFilter
+		</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>sitemesh</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<!-- SiteMesh Integration declaration End -->
+  
   	<!-- Load Context for Acegi security -->
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
@@ -91,11 +92,22 @@
 		</filter-class>
 	</filter>
 	
-
 	<filter-mapping>
 		<filter-name>SessionService</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<!-- SessionService Integration declaration End -->
+	
+	<!-- no access error -->
+    <error-page>
+        <error-code>403</error-code>
+        <location>/WEB-INF/jsp/errors/403error.jsp</location>
+    </error-page>
+
+    <!-- page not found error -->
+    <error-page>
+        <error-code>404</error-code>
+        <location>/WEB-INF/jsp/errors/404error.jsp</location>
+    </error-page>
 
 </web-app>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/images/favicon.png b/YACOSWeb/WebContent/images/favicon.png
new file mode 100644
index 0000000..8800593
Binary files /dev/null and b/YACOSWeb/WebContent/images/favicon.png differ
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
index cadaa16..b7db9a2 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/form/FormPreference.java
@@ -19,4 +19,4 @@ public class FormPreference  {
 	{
 		this.preferences = preferences;
 	}
-} 
+}
