diff --git a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/screen.css b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/screen.css
index d2d31f7..310711d 100644
--- a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/screen.css
+++ b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/screen.css
@@ -40,7 +40,6 @@ div#header {
 --------------------------------------------------------------------*/
 
 div#wrap {
-	padding: 5px 10px;
     background-color: #FFF;
 	}
 
@@ -49,9 +48,13 @@ div#body {
     background-color: #F8F8F8;
 	}
 
+div#page {
+    margin-top: 10px;
+    padding-left: 30px;
+    padding-right: 30px;
+    }
+
 div#content {
-    padding: 30px;
-    padding-top: 10px;
     background-color: #FFF;
     }
 
@@ -125,6 +128,33 @@ h6 {
         border-bottom: none;
         }
 
+#editortitle {
+    margin: 0 30px;
+}
+
+#editor-help {
+    padding: 1em;
+	border: 1px solid;
+    background-image: url("../img/moin-msg-bg-blue.png");
+	border-color: #D2E0F6;
+	background-color: #ECF4FF;
+    }
+
+#editor-help dl {
+    margin: 0 0 2em;
+    }
+
+#editor-help dl dt {
+    margin: 0.5em;
+    font-size: 1.2em;
+    border-bottom: 1px solid #D2E0F6;
+    }
+
+#editor-help dl dd {
+    margin-top: 0.5em;
+    margin-bottom: 1em;
+    }
+
 /* Paragraphs
 --------------------------------------------------------------------*/
 
@@ -338,6 +368,11 @@ div#body div.usertrail span.last:after {
 	background-color: #FFF;
 	}
 
+#pageinfo {
+    text-align: right;
+    font-size: x-small;
+    }
+
 /* Footer.
 --------------------------------------------------------------------*/
 
@@ -432,10 +467,6 @@ div#body div.usertrail span.last:after {
     vertical-align: middle;
     }
 
-#content {
-    padding: 0 50px 0 50px;
-    }
-
 /* 
  * Webenv -> Forms
  *
@@ -602,6 +633,11 @@ div#body div.records-list ul li.title {
     background: #eee;
     border-bottom: 1px #AAA solid;
     }
+
+#editor-textarea {
+    width: 100%;
+    }
+
 /*
  * Webenv -> Links
  *
@@ -776,15 +812,19 @@ div#body div#content div.toc dl dl {
 
 /* Action messages.
 --------------------------------------------------------------------*/
-div#wrap div#message {
-    padding: 0 1em 1em 1em;
+#message {
+    padding: 0 2em 0em;
 	border: none;
 	border-top: 4px solid;
 	border-bottom: 4px solid;
     background-image: url("../img/moin-msg-bg-blue.png");
 	border-color: #D2E0F6; 
 	background-color: #ECF4FF;
-}
+    }
+
+#message .buttons {
+    margin-bottom: 1em;
+    }
 
 
 /* Admonitions
@@ -1005,8 +1045,8 @@ div#header div.tabs span:hover a span {
     display: inline;
     white-space: nowrap;
     margin-left: 3px;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding-top: 4px;
+    padding-bottom: 4px;
     border-width: 1px;
     border-style: solid;
     border-color: #628ECA;
@@ -1030,10 +1070,19 @@ div#header div.tabs span:hover a span {
     }
 
 .navibar li a { 
-    /* To cover the box area as linkable */
-    padding: 8px;
-    padding-top: 7px;
-    padding-bottom: 5px;
+    /* To cover the box area as linkable in the header area */
+    padding: 7px 8px; 
+    }
+
+#header .navibar li.current a { 
+    /* To cover the box area as linkable in the header area */
+    padding: 6px 8px 7px; 
+    }
+
+
+#footer .navibar li.current a { 
+    /* To cover the box area as linkable in the footer area */
+    padding: 7px 8px 6px;
     }
 
 .navibar a, .navibar a:visited {
@@ -1045,6 +1094,7 @@ div#header div.tabs span:hover a span {
     color: #FFFFFF;
     text-decoration: none;
     font-weight: bold;
+    padding-top: 6px;
     }
 
 .navibar li:hover {
@@ -1074,9 +1124,7 @@ div#header div.tabs span:hover a span {
     }
 
 #username {
-    padding: 0;
-    margin: 0.4em;
-    margin-top: 0;
+    margin: 5px 0 0 0;
     text-align: right;
     font-size: 0.82em;
     white-space: nowrap;
@@ -1088,10 +1136,13 @@ div#header div.tabs span:hover a span {
 
 #username li {
     display: inline;
-    padding: 0;
     padding-right: 0.5em;
     }
 
+#username li:last-child {
+    padding-right: 0; 
+    }
+
 #username form {
     display: inline;
     }
@@ -1124,9 +1175,7 @@ div#header div.tabs span:hover a span {
     }
 
 #searchform input{
-    font-size: 0.85em;
-    padding: 1px;
-    padding-left: 3px;
+    padding: 3px;
     }
 
 #searchinput {
@@ -1136,7 +1185,8 @@ div#header div.tabs span:hover a span {
     border-color: #204C8D;
     color: #204C8D;
     display: inline;
-    width: 130px;
+    width: 230px;
+    -moz-border-radius: 5px;
     }
 
 #titlesearch, #fullsearch {
@@ -1149,6 +1199,7 @@ div#header div.tabs span:hover a span {
     display: inline;
     font-weight: bold;
     text-decoration: none;
+    -moz-border-radius: 5px;
     }
 
 #searchform label {
@@ -1162,9 +1213,7 @@ div#header div.tabs span:hover a span {
 
 #pagetrail {
     font-size: 0.82em;
-    margin:0.4em;
-    padding:0;
-    padding-right: 0.5em;
+    margin: 5px 0 0 0;
     text-align: right;
     }
 
@@ -1241,13 +1290,13 @@ div#header div.tabs span:hover a span {
     content: "";
     }
 
-#username a:link { text-decoration: none; color: #EEE; }
+#username a:link { text-decoration: none; color: #EEE;}
 #username a:hover { text-decoration: underline; color: #FFF; }
 #username a:active { text-decoration: underline; color: #FFF; }
 #username a:visited { text-decoration: none; color: #EEE; }
 #username a:visited:hover { text-decoration: underline; color: #FFF; }
 
-#pagetrail a:link { text-decoration: none; color: #EEE; }
+#pagetrail a:link { text-decoration: none; color: #EEE;}
 #pagetrail a:hover { text-decoration: underline; color: #FFF; }
 #pagetrail a:active { text-decoration: underline; color: #FFF; }
 #pagetrail a:visited { text-decoration: none; color: #EEE; }