Index: rave-portal-resources/src/main/resources/messages_es.properties
===================================================================
--- rave-portal-resources/src/main/resources/messages_es.properties	(revision 1365139)
+++ rave-portal-resources/src/main/resources/messages_es.properties	(working copy)
@@ -114,6 +114,7 @@
   Seleccione el link(arriba) del Widget Store para agregar mas Widgets\!
 
 page.login.title=Iniciar sesi\u00F3n
+page.login.button=Volver a p\u00E1gina de acceso
 page.login.createaccount=Nuevo Usuario
 page.login.createaccount.label=Registrarse\:
 page.login.createaccount.button=Cree un nueva cuenta
Index: rave-portal-resources/src/main/resources/messages_nl.properties
===================================================================
--- rave-portal-resources/src/main/resources/messages_nl.properties	(revision 1365139)
+++ rave-portal-resources/src/main/resources/messages_nl.properties	(working copy)
@@ -115,6 +115,7 @@
   Klik op de Widgetwinkel link hierboven om meer widgets toe te voegen!
 
 page.login.title=Inloggen
+page.login.button=Terug naar login pagina
 page.login.createaccount=Nieuwe gebruiker
 page.login.createaccount.label=Registreer:
 page.login.createaccount.button=Cre\u00EBer een nieuw account
Index: rave-portal-resources/src/main/resources/messages.properties
===================================================================
--- rave-portal-resources/src/main/resources/messages.properties	(revision 1365139)
+++ rave-portal-resources/src/main/resources/messages.properties	(working copy)
@@ -104,6 +104,7 @@
 page.layout.newuser.subtitle=We have provided a few sample widgets for you to try out.  Click on the Widget Store link above to add more widgets!
 
 page.login.title=Login
+page.login.button=Return to login page
 page.login.createaccount=New User
 page.login.createaccount.label=Register:
 page.login.createaccount.button=Create New Account
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp	(revision 1365139)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp	(working copy)
@@ -23,75 +23,50 @@
 <tiles:putAttribute name="pageTitleKey" value="page.retrieveusername.title"/>
 <tiles:importAttribute name="pageTitleKey" scope="request"/>
 
-<header>
-    <nav>
-        <div class="navbar navbar-fixed-top">
-            <div class="container">
-                <a href="<c:url value="/"/>" class="brand">RAVE</a>
-                <ul class="nav pull-right">
-                    <li class="divider-vertical"></li>
-                    <li>
-                        <form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
-                            <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
-                            <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
-                    <li>
-                        <form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
-                            <fieldset>
-                                <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
-                                <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
-                            </fieldset>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</header>
-<br><br>
-<div class="container navbar-spacer">
-    <h1><fmt:message key="page.retrieveusername.title"/></h1>
-    <c:choose>
-        <c:when test="${success}">
+<rave:login_navbar hideButton="requestNewUsernameButton" />
 
-            <div class="alert-message success">
-                <fmt:message key="page.newpassword.email.sent">
-                    <fmt:param>${email}</fmt:param>
-                </fmt:message>
-            </div>
-            <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
-        </c:when>
-
-        <c:otherwise>
-            <form:form cssClass="form-horizontal well" commandName="user" action="retrieveusername" method="post">
-                <fieldset>
-                    <p><fmt:message key="form.all.fields.required"/></p>
-
-                    <p><form:errors cssClass="error"/></p>
-
-                    <div class="control-group">
-
-                        <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
-                        <div class="controls">
-                            <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
-                            <form:errors path="email" cssClass="error"/>
-                        </div>
-                    </div>
-                </fieldset>
-                <fieldset>
-                    <div class="control-group">
-                        <div class="controls">${captchaHtml}</div>
-                    </div>
-                </fieldset>
-
-                <fieldset>
-                    <fmt:message key="page.login.forgot.username.button" var="submitButtonText"/>
-                    <button class="btn btn-primary" type="submit" value="${submitButtonText}">${submitButtonText}</button>
-                </fieldset>
-            </form:form>
-        </c:otherwise>
-    </c:choose>
+<div class="container-fluid">
+	<div class="row-fluid">
+	    <h1><fmt:message key="page.retrieveusername.title"/></h1>
+	    <c:choose>
+	        <c:when test="${success}">
+	
+	            <div class="alert-message success">
+	                <fmt:message key="page.newpassword.email.sent">
+	                    <fmt:param>${email}</fmt:param>
+	                </fmt:message>
+	            </div>
+	            <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
+	        </c:when>
+	
+	        <c:otherwise>
+	            <form:form cssClass="form-horizontal well" commandName="user" action="retrieveusername" method="post">
+	                <fieldset>
+	                    <p><fmt:message key="form.all.fields.required"/></p>
+	
+	                    <p><form:errors cssClass="error"/></p>
+	
+	                    <div class="control-group">
+	
+	                        <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
+	                        <div class="controls">
+	                            <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
+	                            <form:errors path="email" cssClass="error"/>
+	                        </div>
+	                    </div>
+	                </fieldset>
+	                <fieldset>
+	                    <div class="control-group">
+	                        <div class="controls">${captchaHtml}</div>
+	                    </div>
+	                </fieldset>
+	
+	                <fieldset>
+	                    <fmt:message key="page.login.forgot.username.button" var="submitButtonText"/>
+	                    <button class="btn btn-primary" type="submit" value="${submitButtonText}">${submitButtonText}</button>
+	                </fieldset>
+	            </form:form>
+	        </c:otherwise>
+	    </c:choose>
+	</div>
 </div>
\ No newline at end of file
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp	(revision 1365139)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp	(working copy)
@@ -24,39 +24,17 @@
 <tiles:putAttribute name="pageTitleKey" value="page.newaccount.title"/>
 <tiles:importAttribute name="pageTitleKey" scope="request"/>
 
-<header>
-    <nav>
-        <div class="navbar navbar-fixed-top">
-            <div class="container">
-                <a href="/" class="brand">RAVE</a>
-                <ul class="nav pull-right">
-                    <li class="divider-vertical"></li>
-                    <li>
-                        <form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
-                            <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
-                            <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
-                    <li>
-                        <form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
-                            <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
-                            <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</header>
-<br><br>
-<div class="container navbar-spacer">
-    <h1>${pagetitle}</h1>
+<rave:login_navbar hideButton="createNewAccountButton" />
 
-    <!-- Login information (required) -->
-    <h2><fmt:message key="page.general.login.information"/></h2>
-    <%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+<div class="container-fluid">
+	<div class="row-fluid">
+		<h1><fmt:message key="page.newaccount.title"/></h1>
+	    <!-- Login information (required) -->
+	 		<div class="well">
+		 		<h2><fmt:message key="page.general.login.information"/></h2>
+		 		<%@ include file="/WEB-INF/jsp/views/includes/new_user_form.jsp" %>
+		 	</div>
+	</div>
 </div>
 
 <portal:register-init-script location="${'AFTER_RAVE'}">
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp	(revision 1365139)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp	(working copy)
@@ -26,145 +26,98 @@
     <tiles:importAttribute name="pageTitleKey" scope="request"/>
 
     <tiles:putAttribute name="body">
-        <div class="container">
+    
+    <rave:login_navbar hideButton="loginButton" />
+    
+        <div class="container-fluid">
             <c:if test="${not empty message}">
                 <div class="alert alert-info">${message}</div>
             </c:if>
-
+            
             <h1><fmt:message key="${pageTitleKey}"/></h1>
-
-
-            <div class="row well">
-                <div class="span6">
-                        <%--
-                            //############################################
-                            // LOGIN FORM
-                            //############################################
-                        --%>
-                    <form class="form-horizontal" id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
-
-                        <c:if test="${param['authfail'] eq 'form'}">
-                            <p class="error"><fmt:message key="page.login.usernamepassword.fail"/></p>
-                        </c:if>
-                        <fieldset>
-                            <legend><fmt:message key="page.login.usernamepassword"/></legend>
-                            <div class="control-group">
-                                <label class="control-label" for="usernameField"><fmt:message key="page.general.username"/></label>
-                                <div class="controls">
-                                    <input class="input-large" id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
-                                <div class="controls">
-                                    <input class="input-large" id="passwordField" type="password" name="j_password"/>
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label" for="remember_me">
-                                    <fmt:message key="page.login.rememberme"/>
-                                </label>
-                                <div class="controls">
-                                    <input type='checkbox' name='_spring_security_remember_me' id="remember_me" value="true"/>
-                                </div>
-                            </div>
-                        </fieldset>
-                        <fieldset>
-                            <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
-                            <div class="controls">
-                                <button class="btn btn-primary" type="submit" value="${loginButtonText}">${loginButtonText}</button>
-                            </div>
-                        </fieldset>
-                    </form>
-                </div>
-                <div class="span4">
-                        <%--
-                            //############################################
-                            // OPENID LOGIN
-                            //############################################
-                        --%>
-
-                    <form class="form-horizontal" id="openIdForm" name='oidf' action='j_spring_openid_security_check' method='POST'>
-                        <c:if test="${param['authfail'] eq 'openid'}">
-                            <p class="error"><fmt:message key="page.login.openid.fail"/></p>
-                        </c:if>
-                        <fieldset>
-                            <legend><fmt:message key="page.login.openid"/></legend>
-                            <div class="control-group">
-                                <label class="control-label" for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
-                                <div class="controls">
-                                    <input class="input-large" type="text" id="openid_identifier" name='openid_identifier'/>
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label" for="remember_me">
-                                    <fmt:message key="page.login.rememberme"/>
-                                </label>
-                                <div class="controls">
-                                    <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
-                                </div>
-                            </div>
-                        </fieldset>
-                        <fieldset>
-                            <fmt:message key="page.login.openid.button" var="openidButtonText"/>
-                            <div class="controls">
-                                <button class="btn btn-primary" type="submit" value="${openidButtonText}">${openidButtonText}</button>
-                            </div>
-                        </fieldset>
-
-                    </form>
-                </div>
+            <div class="row-fluid" id="loginOptions">
+            	<div id="loginBlock" class="clearfix well">
+	                <div class="span6">
+	                        <%--
+	                            //############################################
+	                            // LOGIN FORM
+	                            //############################################
+	                        --%>
+	                    <form class="form-horizontal" id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
+	
+	                        <c:if test="${param['authfail'] eq 'form'}">
+	                            <p class="error"><fmt:message key="page.login.usernamepassword.fail"/></p>
+	                        </c:if>
+	                        <fieldset>
+	                            <legend><fmt:message key="page.login.usernamepassword"/></legend>
+	                            <div class="control-group">
+	                                <label class="control-label" for="usernameField"><fmt:message key="page.general.username"/></label>
+	                                <div class="controls">
+	                                    <input class="input-large" id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
+	                                </div>
+	                            </div>
+	                            <div class="control-group">
+	                                <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
+	                                <div class="controls">
+	                                    <input class="input-large" id="passwordField" type="password" name="j_password"/>
+	                                </div>
+	                            </div>
+	                            <div class="control-group">
+	                                <label class="control-label" for="remember_me">
+	                                    <fmt:message key="page.login.rememberme"/>
+	                                </label>
+	                                <div class="controls">
+	                                    <input type='checkbox' name='_spring_security_remember_me' id="remember_me" value="true"/>
+	                                </div>
+	                            </div>
+	                        </fieldset>
+	                        <fieldset>
+	                            <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
+	                            <div class="controls">
+	                                <button class="btn btn-primary" type="submit" value="${loginButtonText}">${loginButtonText}</button>
+	                            </div>
+	                        </fieldset>
+	                    </form>
+	                </div>
+	                <div class="span4">
+	                        <%--
+	                            //############################################
+	                            // OPENID LOGIN
+	                            //############################################
+	                        --%>
+	
+	                    <form class="form-horizontal" id="openIdForm" name='oidf' action='j_spring_openid_security_check' method='POST'>
+	                        <c:if test="${param['authfail'] eq 'openid'}">
+	                            <p class="error"><fmt:message key="page.login.openid.fail"/></p>
+	                        </c:if>
+	                        <fieldset>
+	                            <legend><fmt:message key="page.login.openid"/></legend>
+	                            <div class="control-group">
+	                                <label class="control-label" for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
+	                                <div class="controls">
+	                                    <input class="input-large" type="text" id="openid_identifier" name='openid_identifier'/>
+	                                </div>
+	                            </div>
+	                            <div class="control-group">
+	                                <label class="control-label" for="remember_me">
+	                                    <fmt:message key="page.login.rememberme"/>
+	                                </label>
+	                                <div class="controls">
+	                                    <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
+	                                </div>
+	                            </div>
+	                        </fieldset>
+	                        <fieldset>
+	                            <fmt:message key="page.login.openid.button" var="openidButtonText"/>
+	                            <div class="controls">
+	                                <button class="btn btn-primary" type="submit" value="${openidButtonText}">${openidButtonText}</button>
+	                            </div>
+	                        </fieldset>
+	
+	                    </form>
+	                </div>
+            	</div>
             </div>
-            <div class="row">
-                    <%--
-                    //############################################
-                    // PASSWORD REMINDER
-                    //############################################
-                    --%>
-
-                <form class="form-horizontal well" action="<c:url value="/app/newpassword"/>" method="get">
-                    <fieldset>
-                        <legend><fmt:message key="page.login.forgot.password"/></legend>
-                        <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
-
-                        <label for="requestNewPasswordButton"><fmt:message key="page.login.forgot.password.label"/></label>
-                        <div class="controls">
-                            <button class="btn btn-primary" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
-                        </div>
-                    </fieldset>
-                </form>
-                    <%--
-                     //############################################
-                     // ACCOUNT REMINDER
-                     //############################################
-                    --%>
-                <form class="form-horizontal well" action="<c:url value="/app/retrieveusername"/>" method="get">
-                    <fieldset>
-                        <legend><fmt:message key="page.login.forgot.username"/></legend>
-                        <label for="requestNewUsernameButton"><fmt:message key="page.login.forgot.username.label"/></label>
-                        <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
-                        <div class="controls">
-                            <button class="btn btn-primary" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
-                        </div>
-                    </fieldset>
-                </form>
-
-                    <%--
-                      //############################################
-                      // NEW ACCOUNT REQUEST
-                      //############################################
-                    --%>
-                <form class="form-horizontal well" action="<c:url value="/app/newaccount.jsp"/>" method="get">
-                    <fieldset>
-                        <legend><fmt:message key="page.login.createaccount"/></legend>
-                        <label for="createNewAccountButton"><fmt:message key="page.login.createaccount.label"/></label>
-                        <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
-                        <div class="controls">
-                            <button class="btn btn-primary" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
-                        </div>
-                    </fieldset>
-                </form>
-            </div>
         </div>
     </tiles:putAttribute>
 </tiles:insertDefinition>
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp	(revision 1365139)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp	(working copy)
@@ -24,74 +24,48 @@
 <tiles:putAttribute name="pageTitleKey" value="page.newpassword.title"/>
 <tiles:importAttribute name="pageTitleKey" scope="request"/>
 
-<header>
-    <nav>
-        <div class="navbar navbar-fixed-top">
-            <div class="container">
-                <a href="<c:url value="/"/>" class="brand">RAVE</a>
-                <ul class="nav pull-right">
-                    <li class="divider-vertical"></li>
-                    <li>
-                        <form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
-                            <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
-                            <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
+    <rave:login_navbar hideButton="requestNewPasswordButton" />
 
-                    <li>
-                        <form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
-                            <fieldset>
-                                <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
-                                <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
-                            </fieldset>
-                        </form>
-                    </li>
-                    <li class="divider-vertical"></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</header>
-<br><br>
-<div class="container navbar-spacer">
-    <h1><fmt:message key="page.newpassword.title"/></h1>
-    <c:choose>
-        <c:when test="${success}">
-            <div class="alert-message success">
-                <fmt:message key="page.newpassword.email.sent">
-                    <fmt:param>${email}</fmt:param>
-                </fmt:message>
-            </div>
-            <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
-        </c:when>
-
-        <c:otherwise>
-
-            <form:form cssClass="form-horizontal well" commandName="user" action="newpassword" method="post">
-                <fieldset>
-                    <p><fmt:message key="form.all.fields.required"/></p>
-
-                    <p><form:errors cssClass="error"/></p>
-
-                    <div class="control-group">
-                        <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
-                        <div class="controls">
-                            <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
-                            <form:errors path="email" cssClass="error"/>
-                        </div>
-                    </div>
-                </fieldset>
-                <fieldset>
-                    <div class="control-group">
-                        <div class="controls">${captchaHtml}</div>
-                    </div>
-                </fieldset>
-                <fieldset>
-                    <fmt:message key="page.login.forgot.password.button" var="submitButtonText"/>
-                    <button type="submit" class="btn btn-primary" value="${submitButtonText}">${submitButtonText}</button>
-                </fieldset>
-            </form:form>
-        </c:otherwise>
-    </c:choose>
+<div class="container-fluid">
+	<div class="row-fluid">
+	    <h1><fmt:message key="page.newpassword.title"/></h1>
+	    <c:choose>
+	        <c:when test="${success}">
+	            <div class="alert-message success">
+	                <fmt:message key="page.newpassword.email.sent">
+	                    <fmt:param>${email}</fmt:param>
+	                </fmt:message>
+	            </div>
+	            <a href="<c:url value="/"/>"><fmt:message key="page.newpassword.email.sent.login"/></a>
+	        </c:when>
+	
+	        <c:otherwise>
+	
+	            <form:form cssClass="form-horizontal well" commandName="user" action="newpassword" method="post">
+	                <fieldset>
+	                    <p><fmt:message key="form.all.fields.required"/></p>
+	
+	                    <p><form:errors cssClass="error"/></p>
+	
+	                    <div class="control-group">
+	                        <label class="control-label" for="emailField"><fmt:message key="page.general.email"/></label>
+	                        <div class="controls">
+	                            <form:input id="emailField" path="email" required="required" autofocus="autofocus"/>
+	                            <form:errors path="email" cssClass="error"/>
+	                        </div>
+	                    </div>
+	                </fieldset>
+	                <fieldset>
+	                    <div class="control-group">
+	                        <div class="controls">${captchaHtml}</div>
+	                    </div>
+	                </fieldset>
+	                <fieldset>
+	                    <fmt:message key="page.login.forgot.password.button" var="submitButtonText"/>
+	                    <button type="submit" class="btn btn-primary" value="${submitButtonText}">${submitButtonText}</button>
+	                </fieldset>
+	            </form:form>
+	        </c:otherwise>
+	    </c:choose>
+	</div>
 </div>
\ No newline at end of file
Index: rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag	(revision 0)
+++ rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag	(working copy)
@@ -0,0 +1,72 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+
+--%>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%@ attribute name="hideButton" required="false" description="The button that should not be displayed on current page" %>
+
+	<header>
+		<div class="navbar">
+			<div class="navbar-inner">
+				<div class="container">
+		            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+		                <span class="icon-bar"></span>
+		                <span class="icon-bar"></span>
+		                <span class="icon-bar"></span>
+		            </a>
+		            <span class="brand">RAVE</span>
+		            <div class="nav-collapse">
+		                 <ul class="nav pull-right">		                 
+		                 	<c:if test="${hideButton ne 'loginButton'}">
+		                        <li>
+		                        	<a id="loginButton" type="submit" href="/">
+		                        		&laquo; 
+				                    	<fmt:message key="page.login.button" />
+		                        	</a>
+		                        </li>
+		                    </c:if>
+		                 	<c:if test="${hideButton ne 'requestNewPasswordButton'}">
+		                        <li>
+		                        	<form action="<c:url value="/app/newpassword"/>" method="get">
+				                    	<fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
+				                    	<button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+				                    </form>
+		                        </li>
+		                    </c:if>
+		                 	<c:if test="${hideButton ne 'requestNewUsernameButton'}">
+		                        <li>
+		                        	<form action="<c:url value="/app/retrieveusername"/>" method="get">
+				                        <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
+			                            <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+			                    	</form>
+		                        </li>
+		                    </c:if>
+		                 	<c:if test="${hideButton ne 'createNewAccountButton'}">
+		                        <li>
+			                        <form action="<c:url value="/app/newaccount.jsp"/>" method="get">
+					                    <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
+					                    <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+					                </form>
+		                        </li>
+		                    </c:if>
+		                 </ul>
+		             </div>
+		        </div>
+		    </div>
+		</div>
+	</header>
Index: rave-portal-resources/src/main/webapp/static/css/rave-css.less
===================================================================
--- rave-portal-resources/src/main/webapp/static/css/rave-css.less	(revision 1365139)
+++ rave-portal-resources/src/main/webapp/static/css/rave-css.less	(working copy)
@@ -20,7 +20,14 @@
 .hidden {
     display: none;
 }
-
+.alert-error a{
+	color: @errorText;
+	text-decoration: underline;
+	
+	&:hover{
+		color: #B12926;
+	}
+}
 /* content */
 #content {
     background-color: transparent;
@@ -219,6 +226,14 @@
 /* layout */
 .navbar {
     margin-bottom: 18px;
+    
+    .nav form{
+	    margin: 0;
+	    
+	    button{
+		    margin-top: 7px;
+	    }
+    }
 }
 
 .regions {
@@ -781,8 +796,12 @@
 
 #errorStack {
     display: none;
-    width: 90%;
     margin: auto;
+    text-align: center;
+    
+    pre{
+	    text-align: left;
+    }
 }
 
 .errorMessage {