diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index 7d8936a7..ddae6bde 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -1,6 +1,6 @@
 /* HEADER STYLES */
 #header {
-    margin-top: 2px;
+    margin-top: 0px;
     height: 78px;
     width: 100%;
     background: white;
@@ -31,7 +31,7 @@
 }
 
 #headerLogo {
-    margin-top: 8px;
+    margin-top: 13px;
     height: 80px;
     width: 160px;
     background: url("../images/logo-medium.png") no-repeat;
@@ -100,30 +100,6 @@ div#headerButtons activelink a, div#headerButtons activelink a:hover {
     border-bottom: 0;
 }
 
-#signUpHeader {
-    padding-right: 8px;
-    padding-top: 4px;
-    position: absolute;
-    right: 0;
-    z-index: 50;
-    text-align: center;
-}
-
-#signUpHeader a, #signUpHeader a:hover {
-    font-size: 100%;
-    color: #BBB4D6;
-    text-decoration: underline;
-}
-
-#editorHeader {
-    height: 40px;
-    width: 100%;
-    background: white;
-    border-bottom: 1px solid #bbb4d6;
-    position: absolute;
-    top: 0;
-    left: 0;
-}
 
 #footer {
     width: 100%;
@@ -166,6 +142,11 @@ div#headerActions {
     position: absolute;
     right: 0;
     z-index: 50;
+
+}
+
+#headerActions span {
+    border-bottom: 3px solid  #F7C931;
 }
 
 div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited {
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp
index 751ababe..6d8978bf 100644
--- a/wise-webapp/src/main/webapp/jsp/header.jsp
+++ b/wise-webapp/src/main/webapp/jsp/header.jsp
@@ -8,27 +8,19 @@
         <c:choose>
             <c:when test="${principal != null}">
                 <div id="headerActions">
-                    <spring:message code="WELCOME"/>
-                    , ${principal.firstname}
-                    | <a href="${pageContext.request.contextPath}/c/mymaps.htm">
-                    <spring:message code="MY_WISEMAPS"/>
-                </a>
-                    | <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
-                         title="<spring:message code="SETTINGS_DETAIL"/>">
-                    <spring:message code="SETTINGS"/>
-                </a>
-                    | <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
-                    <spring:message code="LOGOUT"/>
-                </a>
+                    <spring:message code="WELCOME"/>, ${principal.firstname}
+                    | <span><a href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span>
+                    | <span><a href="${pageContext.request.contextPath}/c/settings.htm" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
+                    | <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
                 </div>
             </c:when>
             <c:when test="${param.removeSignin!=true}">
-                <div id="signUpHeader">
+                <div id="headerActions">
                     <spring:message code="ALREADY_A_MEMBER"/>
-                    <a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
+                    <span><a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
                         <spring:message code="SIGN_IN"/>
-                    </a>
-                </div>
+                    </a></span>
+                    </div>
             </c:when>
         </c:choose>
         <div class="header_languages">