diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index 50bd4ece..7ddba53c 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -248,7 +248,7 @@ ACCESS_HAS_BEEN_REVOKED= Upps. your access permissions to this map has been revo
 MAP_CAN_NOT_BE_FOUND= Upps. The map can not be found. It must have been deleted.
 LICENSE=License
 WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
-WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
+WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>
 OPENID_LOGIN=Open Id Login
 LOGING_OPENID_DETAILS=Do you already have an account on one of these sites?. Click the logo to log in with it here:
 WHY_OPENID=<b>Why OpenID ?</b></br> It's a single username and password that allows you to log in to any OpenID-enabled site. It works on thousands of websites.</br>It's an open standard. </br><a href="http://openid.net/what/">learn more</a>
diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index b31520bc..e78a82ab 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -57,6 +57,7 @@ html,body {
     padding-left: 7px;
     font-weight: bold;
     vertical-align: middle;
+    font-size: 20px;
 }
 
 #headerButtons {
diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css
index 8be3ea30..dac20288 100644
--- a/wise-webapp/src/main/webapp/css/pageTemplate.css
+++ b/wise-webapp/src/main/webapp/css/pageTemplate.css
@@ -2,7 +2,7 @@
 @import "pageHeaders.css";
 
 div#register {
-    margin: 40px auto;
+    margin: 20px auto;
     text-align: center;
     white-space: nowrap;
 }
@@ -17,34 +17,6 @@ div#pageContainer {
     min-height: 100%;
 }
 
-div.bodyContainer {
-    padding-top: 30px;
-    padding-bottom: 85px; /* Height of the footer */
-}
-
-div.bodyContainer h1 {
-    color: #093A9D;
-    font-size: 150%;
-    margin-bottom: 5px;
-    font-weight: bold;
-}
-
-div.bodyContainer h2 {
-    color: gray;
-    font-size: 150%;
-    border-bottom: 1px dashed #BBB4D6;
-    margin: 20px 0;
-}
-
-div.bodyContainer ul {
-    padding: 5px;
-}
-
-div.bodyContainer li {
-    list-style-type: disc;
-    margin-left: 12px;
-}
-
 #footerContainer {
     padding-top: 10px;
     border-top: 1px black solid;
@@ -62,17 +34,25 @@ span.errorMsg {
     color: red;
 }
 
-div.fform {
-    background: #eeeeee;
-    border: 1px solid #cfcfcf;
-    padding: 5px 25px;
-    -moz-border-radius: 8px;
-    -khtml-border-radius: 8px;
-    -webkit-border-radius: 8px;
-    border-radius: 8px;
+/* Reduce styles */
+.jumbotron > h1 {
+    font-size: 35px;
 }
 
-div.fform label {
-    font-weight: bold;
+.jumbotron  p {
+    font-size: 15px;
+}
+
+#login h1 {
+    font-size: 25px;
+}
+
+#loginPanel {
+    padding: 0 60px;
+    background: #ffffff;
+    margin-top: 40px;
+    background: #F7C931;
+    color: #ffffff;
+
 }
 
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index f20f4271..79d7e2bb 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -12,54 +12,63 @@
     });
 </script>
 
-<div class="row">
-    <div class="col-md-5" style="margin-top: 20px">
+<div class="row" id="login">
+    <div class="col-md-6" style="padding-top: 25px">
         <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
         <spring:message code="WELCOME_DETAILS"/>
     </div>
-    <div id="login" class="fform col-md-6">
-        <h1><spring:message code="SIGN_IN"/></h1>
+    <div class="col-md-6">
+        <div class="row jumbotron" id="loginPanel">
+            <h1><spring:message code="SIGN_IN"/></h1>
 
-        <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="email"><spring:message code="EMAIL"/></label>
-                <div class="col-md-10">
-                    <input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
+            <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal"
+                  id="loginForm">
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="email"><spring:message code="EMAIL"/>: </label>
+
+                    <div class="col-md-9">
+                        <input type='email' tabindex="1" id="email" name='j_username' required="required"
+                               class="form-control"/>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-md-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
-                <div class="col-md-10">
-                    <input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
+                <div class="form-group">
+                    <label class="col-md-3 control-label" for="password"><spring:message code="PASSWORD"/>: </label>
+
+                    <div class="col-md-9">
+                        <input type='password' tabindex="2" id="password" name='j_password' required="required"
+                               class="form-control"/>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" style="text-align: center" >
-                <div class="col-md-offset-2 col-md-10" style="text-align: center" >
-                    <button class="btn btn-primary" tabindex="4" data-loading-text="<spring:message code="SIGN_ING"/>"><spring:message code="SIGN_IN"/></button>
-                    <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>  <label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
+                <div class="form-group" style="text-align: center">
+                    <div class="col-md-offset-2 col-md-10" style="text-align: center">
+                        <button class="btn btn-primary" tabindex="4"
+                                data-loading-text="<spring:message code="SIGN_ING"/>">
+                            <spring:message code="SIGN_IN"/></button>
+                        <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/> <label
+                            for="rememberme"><spring:message code="REMEMBER_ME"/></label>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group" style="text-align: center" >
-                <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
-            </div>
-            <div class="form-group">
-                <c:if test="${not empty param.login_error}">
-                    <c:choose>
-                        <c:when test="${param.login_error == 3}">
-                            <div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
-                        </c:when>
-                        <c:otherwise>
-                            <div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
-                        </c:otherwise>
-                    </c:choose>
-                </c:if>
-            </div>
-        </form>
+                <div class="form-group" style="text-align: center">
+                    <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
+                </div>
+                <div class="form-group">
+                    <c:if test="${not empty param.login_error}">
+                        <c:choose>
+                            <c:when test="${param.login_error == 3}">
+                                <div class="alert alert-danger"><spring:message code="USER_INACTIVE"/></div>
+                            </c:when>
+                            <c:otherwise>
+                                <div class="alert alert-danger"><spring:message code="LOGIN_ERROR"/></div>
+                            </c:otherwise>
+                        </c:choose>
+                    </c:if>
+                </div>
+            </form>
+        </div>
     </div>
 </div>
-
 <div class="row">
-    <div id="register" class="col-md-10">
+    <div id="register" class="col-md-12">
         <c:if test="${requestScope['security.type']=='db'}">
             <b><spring:message code="NOT_READY_A_USER"/></b>
             <spring:message code="NOT_READY_A_USER_MESSAGE"/>
@@ -69,19 +78,21 @@
         </c:if>
         <c:if test="${requestScope['security.openid.enabled']}">
             <p>
-                <spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message code="HERE"/></b></a>.
+                <spring:message code="LOGIN_USING_OPENID"/> <a href="/c/loginopenid"><b><spring:message
+                    code="HERE"/></b></a>.
             </p>
         </c:if>
     </div>
 </div>
 
 
-<c:if test="${isHsql== 'true'}">
+<c:if test="${isHsql== 'false'}">
     <div class="row">
         <div class="alert alert-info col-md-offset12">
             <span class="label label-danger"><spring:message code="WARNING"/></span> <spring:message
                 code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
-                href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message code="HERE"/></a>.
+                href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"><spring:message
+                code="HERE"/></a>.
         </div>
     </div>
 </c:if>
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index 1e9d274a..a03fde5c 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -51,13 +51,12 @@
         <jsp:param name="removeSignin" value="${requestScope.removeSignin}"/>
     </jsp:include>
 
-    <div class="bodyContainer">
+    <div class="container">
         <div class="row">
-            <div class="col-md-2"></div>
-            <div class="pageBodyContent col-md-8">
-               <div class="row">
-                <tiles:insertAttribute name="body"/>
-               </div>
+            <div class="col-md-offset-1 col-md-10">
+                <div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
+                    <tiles:insertAttribute name="body"/>
+                </div>
             </div>
             <c:if test="${requestScope['google.ads.enabled']}">
                 <div class="row" style="text-align: center;margin: 5px">
diff --git a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
index 9d36a8a4..d11c228e 100755
--- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
@@ -9,29 +9,22 @@
     });
 </script>
 
-<div>
-    <div class="fform">
-        <h1>
-            <spring:message code="FORGOT_PASSWORD"/>
-        </h1>
+<h1>
+    <spring:message code="FORGOT_PASSWORD"/>
+</h1>
 
-        <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
+<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
 
-        <form:form method="post" commandName="resetPassword"  class="form-horizontal">
-            <fieldset>
-                <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
-                <div class="col-md-5">
-                    <input id="email" type="email" required="required" name="email" class="form-control"/>
-                </div>
-                <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
-                       data-loading-text="<spring:message code="SENDING"/>"/>
-                <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
-                       onclick="window.location='<c:url value="c/maps/"/>'"/>
-            </fieldset>
-        </form:form>
-        </br>
+<form:form method="post" commandName="resetPassword" class="form-horizontal">
+    <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
+    <div class="col-md-5">
+        <input id="email" type="email" required="required" name="email" class="form-control"/>
     </div>
-</div>
+    <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"
+           data-loading-text="<spring:message code="SENDING"/>"/>
+    <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
+           onclick="window.location='<c:url value="c/maps/"/>'"/>
+</form:form>
 
 <div id="register">
     <b>
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index 18b094d0..8bb4fb6c 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -1,79 +1,79 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="/jsp/init.jsp" %>
 
-<div class="fform" >
+<h1><spring:message code="USER_REGISTRATION"/></h1>
 
-    <h1><spring:message code="USER_REGISTRATION"/></h1>
+<p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
+<form:form method="post" commandName="user" class="form-horizontal">
+    <div class="form-group">
+        <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
+        <div class="col-md-5">
+            <form:input path="email" id="email" type="email" required="required" class="form-control"/>
+            <form:errors path="email" cssClass="errorMsg"/>
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
 
-    <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
-    <form:form method="post" commandName="user" class="form-horizontal">
-    <fieldset>
-        <div class="form-group">
-            <label for="email" class="col-md-2 control-label"><spring:message code="EMAIL"/>: </label>
-            <div class="col-md-5">
-                <form:input path="email" id="email" type="email" required="required" class="form-control"/>
-                <form:errors path="email" cssClass="errorMsg"/>
-            </div>
+        <div class="col-md-5">
+            <form:input path="firstname" id="firstname" required="required" class="form-control"/>
+            <form:errors path="firstname" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="firstname" class="col-md-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
-            <div class="col-md-5">
-                <form:input path="firstname" id="firstname" required="required" class="form-control"/>
-                <form:errors path="firstname" cssClass="errorMsg"/>
-           </div>
+    </div>
+    <div class="form-group">
+        <label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
+
+        <div class="col-md-5">
+            <form:input path="lastname" id="lastname" required="required" class="form-control"/>
+            <form:errors path="lastname" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="lastname" class="col-md-2 control-label"><spring:message code="LASTNAME"/>: </label>
-            <div class="col-md-5">
-                <form:input path="lastname" id="lastname" required="required" class="form-control"/>
-                <form:errors path="lastname" cssClass="errorMsg"/>
-            </div>
+    </div>
+    <div class="form-group">
+        <label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
+
+        <div class="col-md-5">
+            <form:password path="password" id="password" required="required" class="form-control"/>
+            <form:errors path="password" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="password" class="col-md-2 control-label"><spring:message code="PASSWORD"/>: </label>
-            <div class="col-md-5">
-                <form:password path="password" id="password" required="required" class="form-control"/>
-                <form:errors path="password" cssClass="errorMsg"/>
-            </div>
+    </div>
+    <div class="form-group">
+        <label for="retypePassword" class="col-md-2 control-label"><spring:message
+                code="RETYPE_PASSWORD"/>: </label>
+
+        <div class="col-md-5">
+            <form:password path="retypePassword" id="retypePassword" class="form-control"/>
+            <form:errors path="retypePassword" cssClass="errorMsg"/>
         </div>
-        <div class="form-group">
-            <label for="retypePassword" class="col-md-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label>
-            <div class="col-md-5">
-                <form:password path="retypePassword" id="retypePassword" class="form-control"/>
-                <form:errors path="retypePassword" cssClass="errorMsg"/>
-           </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-10 col-md-offset-2">
-                <c:if test="${requestScope.captchaEnabled}">
-                    ${requestScope.captchaHtml}
+    </div>
+    <div class="form-group">
+        <div class="col-md-10 col-md-offset-2">
+            <c:if test="${requestScope.captchaEnabled}">
+                ${requestScope.captchaHtml}
                 <p>
                     <form:errors path="captcha" cssClass="errorMsg"/>
                 </p>
             </c:if>
-          </div>
         </div>
-        <div>
-            <p>
-                <spring:message code="TERM_OF_THE_SERVICE"/>
-                <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"
-                                                                        target="_blank"><spring:message
-                    code="HERE"/></a>.
-                <spring:message code="REGISTRATION_CLICK_ADVICE"/>
-            </p>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
+    </div>
+    <div class="form-group">
+        <p>
+            <spring:message code="TERM_OF_THE_SERVICE"/>
+            <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
+            <a href="c/termsOfUse" target="_blank"><spring:message code="HERE"/></a>.
+            <spring:message code="REGISTRATION_CLICK_ADVICE"/>
+        </p>
+    </div>
+    <div class="form-group">
+        <div class="col-md-offset-2 col-md-10">
             <input type="submit" value="<spring:message code="REGISTER"/>"
-               data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
-               class="btn btn-primary">
+                   data-loading-text="<spring:message code="REGISTER"/> ..." id="submitButton"
+                   class="btn btn-primary">
             <input type="button" value="<spring:message code="CANCEL"/>"
-               onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
-           <div>
-        <div>
-        </fieldset>
+                   onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
+
+        </div>
+    </div>
+</form:form>
 
-       </form:form>
-</div>