--- a/server/src/main/webapp/static/css/index.css	Fri Apr 05 19:33:39 2013 +0200
+++ b/server/src/main/webapp/static/css/index.css	Mon Apr 08 01:20:47 2013 +0200
@@ -13,7 +13,7 @@
     margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif; background: #F6F6F6; color: #333333;
 }
 h1 {
-    margin-bottom: 5px; padding: 15px; border-bottom: 2px solid #ffffff; background: #333333; color: #ffffff;
+    margin-bottom: 5px; padding: 15px; background: #333333; color: #ffffff;
     font-weight: bold; font-size: 30px;
 }
 h2 {
@@ -77,6 +77,42 @@
     padding-bottom: 1em; /* bottom padding for footer */
 }
 
+header#header {
+    border-bottom: 2px solid #ffffff; background: #333333; color: #ffffff;
+    font-weight: bold; font-size: 30px;
+}
+
+header h1 {
+	float:left;
+}
+
+header #header-clear {
+	clear: both;
+}
+
+header .header-nav {
+	background: #333333; color: #ffffff;
+	float: right;
+    font-weight: normal; font-size: 15px;
+    margin-bottom: 5px; padding: 15px;
+    text-align: right;
+}
+
+
+header .header-nav a, header .header-nav a:ACTIVE, header .header-nav a:LINK, header .header-nav a:VISITED {
+    color: #ffffff;
+    text-decoration: none;
+}
+
+header .header-nav a:HOVER {
+	color: #ffffff;
+	text-decoration: underline;
+}
+
+#header-nav-user-avatar {
+	margin: 0 5px 2px 0;
+}
+
 footer#footer {
     position:absolute;
     bottom:0;
@@ -238,10 +274,6 @@
 }
 
 
-#space-form-container {
-	margin: 12px 0px 0px 15px;
-}
-
 .form-fields div {
 	margin-bottom: 12px; 
 }
@@ -333,3 +365,20 @@
 .proj-sort-asc-col {
     background: url("../img/sort_arrows.png") 0 -33px;  
 }
+
+#inner-container {
+    margin: 12px 0px 0px 15px;
+}
+
+#login-errors {
+    color: #ff0000;
+    border: 1px solid #ff0000;
+    padding: 8px;
+    margin: 16px 16px 32px;
+    width: inherit;
+    float: left;
+}
+
+#login-form {
+	clear: both;
+}