diff --git a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern.py b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern.py
index 370eaa7..25899d5 100755
--- a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern.py
+++ b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern.py
@@ -33,8 +33,8 @@ class Theme(ThemeBase):
             u'<div id="header">',
             self.logo(),
             u'<div id="userlinks">',
-            self.searchform(d),
             self.username(d),
+            self.trail(d),
             u'</div>',
 	        self.navibar(d),
     	    u'<div class="pageline"><hr style="display:none;" /></div>',
@@ -44,7 +44,8 @@ class Theme(ThemeBase):
             # Page
             self.msg(d),
             self.startPage(),
-            self.trail(d),
+            self.searchform(d),
+            self.title(d),
             ]
         return u'\n'.join(html)
 
@@ -66,8 +67,8 @@ class Theme(ThemeBase):
             u'<div id="header">',
             self.logo(),
             u'<div id="userlinks">',
-            self.searchform(d),
             self.username(d),
+            self.trail(d),
             u'</div>',
     	    u'<div class="pageline"><hr style="display:none;"></div>',
             u'</div>',
@@ -126,13 +127,12 @@ class Theme(ThemeBase):
 	        u'<img src="/error/include/img/wiki.png" alt="Wiki" />',
     	    u'<div class="userlinks">',
     	    self.username(d),
-	        self.searchform(d),
+            self.trail(d),
     	    u'</div>',
             u'<h1>Wiki</h1>',
             self.navibar(d),
             self.editbar(d),
             self.interwiki(d),
-            self.trail(d),
             self.title(d),
             u'</div>',
             ]
diff --git a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/common.css b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/common.css
index 0b77e5c..50bd704 100644
--- a/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/common.css
+++ b/Identity/Webenv/Themes/Default/Moin/1.5.9/Modern/css/common.css
@@ -199,7 +199,7 @@ code {
 
 hr {
     clear: both;
-    height: 1px ! important;
+    height: 1px;
     border: none;
     background-color: #DADADA;
     }
@@ -287,7 +287,7 @@ table tr td pre {
 -----------------------------------------------*/
 
 form {
-    display: inline;
+/*    display: inline;*/
     }
 
 input[type="submit"], 
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 e03b941..162550f 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
@@ -1113,7 +1113,7 @@ div#header div.tabs span:hover a span {
     }
 
 #username {
-    margin: 5px 0 0 0;
+    margin: 0;
     text-align: right;
     font-size: 0.82em;
     white-space: nowrap;
@@ -1153,10 +1153,11 @@ div#header div.tabs span:hover a span {
 
 #searchform {
     color: #FFFFFF; 
-    margin-right: 0;
+    margin-top: 5px;
     text-align: right;
     padding: 0;
     white-space: nowrap;
+    float: right;
     }
 
 *[dir="rtl"] #searchform {
@@ -1176,7 +1177,7 @@ div#header div.tabs span:hover a span {
     color: #204C8D;
     display: inline;
     width: 160px;
-    -moz-border-radius: 5px;
+    -moz-border-radius: 3px;
     }
 
 #titlesearch, #fullsearch {
@@ -1189,7 +1190,7 @@ div#header div.tabs span:hover a span {
     display: inline;
     font-weight: bold;
     text-decoration: none;
-    -moz-border-radius: 5px;
+    -moz-border-radius: 3px;
     }
 
 #searchform label {
@@ -1204,6 +1205,8 @@ div#header div.tabs span:hover a span {
 #pagetrail {
     font-size: 0.82em;
     margin: 5px 0 0 0;
+    color: #EEE;
+    text-align: right;
     }
 
 *[dir="rtl"] #pagetrail {
@@ -1236,9 +1239,7 @@ div#header div.tabs span:hover a span {
     }
 
 #pagelocation {
-    margin: 0;
-    margin-top: 1em;
-    margin-bottom: 0.5em;
+    margin: 5px 0;
     padding: 0;
     }
 
@@ -1284,6 +1285,12 @@ div#header div.tabs span:hover a span {
 #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:hover { text-decoration: underline; color: #FFF; }
+#pagetrail a:active { text-decoration: underline; color: #FFF; }
+#pagetrail a:visited { text-decoration: none; color: #EEE; }
+#pagetrail a:visited:hover { text-decoration: underline; color: #FFF; }
+
 #userlinks {
     padding: 10px;
     }
@@ -1298,3 +1305,11 @@ div#header div.tabs span:hover a span {
     line-height: 5px;
     background: #628ECA;
     }
+
+/* Horizontal rules */
+hr.hr1 { height: 2px; }
+hr.hr2 { height: 3px; }
+hr.hr3 { height: 4px; }
+hr.hr4 { height: 5px; }
+hr.hr5 { height: 6px; }
+hr.hr6 { height: 7px; }
diff --git a/Identity/Webenv/Themes/Default/Moin/1.5.9/RecentChanges.png b/Identity/Webenv/Themes/Default/Moin/1.5.9/RecentChanges.png
index ecdadc7..2b4a0f3 100644
Binary files a/Identity/Webenv/Themes/Default/Moin/1.5.9/RecentChanges.png and b/Identity/Webenv/Themes/Default/Moin/1.5.9/RecentChanges.png differ