diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
index d4e3f103..249db319 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
@@ -83,7 +83,7 @@ KEYBOARD_MSG=These are the keyboard shortcuts you can use in the editor!
 FIRST_STEPS=Editor First Steps
 FIRST_STEPS_MSG=Make these first steps in 2 minutes, and start running in 5!
 HOME=Home
-LOGIN_ERROR=The email address or password you provided does not match our records.
+LOGIN_ERROR=The email address or password you entered is incorrect.
 USER_INACTIVE=Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!.
 CREW=The Crew
 ALREADY_A_MEMBER=Already a member?
@@ -100,7 +100,7 @@ PASSWORD_MISSMATCH=Your password entries did not match
 TYPE_CHARACTER_BELOW=Type the characters you see in the picture below.
 WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
 REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
-REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.<br/>Registration is <b> Free</b> and takes just a moment.
+REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.Registration is <b> Free</b> and takes just a moment.
 CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
 DETAIL_INFORMATION=Detail Information
 CREATOR=Creator
diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css
index f0f57ecf..aa6023a7 100644
--- a/wise-webapp/src/main/webapp/css/pageTemplate.css
+++ b/wise-webapp/src/main/webapp/css/pageTemplate.css
@@ -32,23 +32,12 @@ div#mainBody {
 
 div#login {
     float: right;
-    width: 250px;
+    width: 300px;
 }
 
-#forgotPasswordContainer {
-    width: 500px;
-    padding: 10px;
-}
-
-/* This is used to fix IE explorer bug rendering rounded corners*/
 div#loginContent {
     width: 100%;
-    min-height: 250px;
-}
-
-
-div#userRegistration {
-    padding: 10px;
+    min-height: 340px;
 }
 
 div#register {
@@ -219,10 +208,15 @@ div.installCFG h2 {
 div.fform {
     background: #eeeeee;
     border: 1px solid #cfcfcf;
-    padding: 5px 20px;
+    padding: 5px 25px;
     -moz-border-radius: 8px;
     -khtml-border-radius: 8px;
     -webkit-border-radius: 8px;
     border-radius: 8px;
+
+}
+
+div.fform label {
+    font-weight: bold;
 }
 
diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp
index 2f8a896d..5ef15ec4 100644
--- a/wise-webapp/src/main/webapp/jsp/footer.jsp
+++ b/wise-webapp/src/main/webapp/jsp/footer.jsp
@@ -2,7 +2,7 @@
 <div id="footer">
     <div style="width:30%; float:left;">&nbsp;</div>
     <div style="float:left; width:40%;">
-        <p><a href="http://www.wisemapping.com"><spring:message code="COPYRIGHT"/></a></p>
+        <p><a href="http://www.wisemapping.org"><spring:message code="COPYRIGHT"/></a></p>
     </div>
 
     <div style="float:left; text-align:left;padding:5px;">
diff --git a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
index 5bddf0cf..a21d309e 100755
--- a/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/forgotPassword.jsp
@@ -1,48 +1,23 @@
 <%@ include file="/jsp/init.jsp" %>
 
-<script type="text/javascript">
-    if(typeof isOldIE != "undefined"){
-        window.onload = function() {
-            var simpleButtonGenerator = RUZEE.ShadedBorder.create({ corner:8,  border:1 });
-            simpleButtonGenerator.render('forgotPasswordContainer');
 
-            $('submitButton').onclick = displayLoading;
-        };
-    }
-</script>
-
-<div id="forgotPasswordContent">
-    <div id="forgotPasswordContainer" class="sb">
+<div>
+    <div class="fform">
         <h1>
             <spring:message code="FORGOT_PASSWORD"/>
         </h1>
+        <p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
 
-        <h2>
-            <spring:message code="FORGOT_PASSWORD_MESSAGE"/>
-        </h2>
         <form:form method="post" commandName="forgotPassword">
-            <table>
-                <tbody>
-                    <tr>
-                        <td>
-                            <spring:message code="EMAIL"/>:
-                        </td>
-                        <td>
-                            <form:input path="email" id="email" tabindex="1"/>
-                            <form:errors path="email" cssClass="errorMsg"/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>&nbsp;</td>
-                        <td>
-                            <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"
-                                   id="submitButton">
-                            <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
-                                   onclick="window.location='<c:url value="mymaps.htm"/>'">
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
+            <fieldset>
+                <label for="email"><spring:message code="EMAIL"/></label>
+                <form:input path="email" id="email" tabindex="1" type="email" required="required"/>
+                <form:errors path="email" cssClass="errorMsg"/>
+
+                <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
+                <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
+                       onclick="window.location='<c:url value="c/mymaps.htm"/>'"/>
+            </fieldset>
         </form:form>
     </div>
 </div>
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 954fbf1c..b4a98d03 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -18,17 +18,6 @@
             <spring:message code="SIGN_IN"/>
         </h1>
 
-        <c:if test="${not empty param.login_error}">
-            <c:choose>
-                <c:when test="${param.login_error == 3}">
-                    <spring:message code="USER_INACTIVE"/>
-                </c:when>
-                <c:otherwise>
-                    <spring:message code="LOGIN_ERROR"/>
-                </c:otherwise>
-            </c:choose>
-        </c:if>
-
         <form action="<c:url value='/c/j_spring_security_check'/>" method="POST">
             <fieldset>
                 <label for="email">
@@ -38,8 +27,20 @@
                     <label for="password"><spring:message code="PASSWORD"/></label>
                     <input type='password' tabindex="2" id="password" name='j_password' required="required"/>
 
+                    <c:if test="${not empty param.login_error}">
+                    <c:choose>
+                    <c:when test="${param.login_error == 3}">
+                    <div class="alert alert-error"><spring:message code="USER_INACTIVE"/></div>
+                    </c:when>
+                    <c:otherwise>
+                    <div class="alert alert-error"><spring:message code="LOGIN_ERROR"/></div>
+                    </c:otherwise>
+                    </c:choose>
+                    </c:if>
+
                     <div class="form-inline">
-                        <input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>" data-toggle="button">&nbsp;&nbsp;&nbsp;
+                        <input type="submit" class="btn btn-primary" value="<spring:message code="SIGN_IN"/>"
+                               data-toggle="button">&nbsp;&nbsp;&nbsp;
                         <input type="checkbox" id="rememberme" name="_spring_security_remember_me"/>
                         <label for="rememberme"><spring:message code="REMEMBER_ME"/></label>
                     </div>
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index 56833fc4..cca1f547 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -1,115 +1,57 @@
 <%@ include file="/jsp/init.jsp" %>
 
 
-<div id="userRegistrationContent">
-    <div id="userRegistration" class="sb">
-        <h1>
-            <spring:message code="USER_REGISTRATION"/>
-        </h1>
+<div>
+    <div class="fform">
 
-        <h2>
-            <spring:message code="REGISTRATION_TITLE_MSG"/> <spring:message code="FIELD_REQUIRED_MSG"/>
-        </h2>
+        <h1><spring:message code="USER_REGISTRATION"/></h1>
+
+        <p><spring:message code="REGISTRATION_TITLE_MSG"/></p>
         <form:form method="post" commandName="user">
-            <table>
-                <tbody>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="email"><spring:message code="EMAIL"/>:</label>
-                    </td>
-                    <td>
-                        <form:input path="email" id="email"/>
-                        <form:errors path="email" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="username"> <spring:message code="USERNAME"/>:</label>
-                    </td>
-                    <td>
-                        <form:input path="username" id="username"/>
-                        <form:errors path="username" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="firstname"><spring:message code="FIRSTNAME"/>:</label>
-                    </td>
-                    <td>
-                        <form:input path="firstname" id="firstname"/>
-                        <form:errors path="firstname" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="lastname"><spring:message code="LASTNAME"/>:</label>
-                    </td>
-                    <td>
-                        <form:input path="lastname" id="lastname"/>
-                        <form:errors path="lastname" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="password"><spring:message code="PASSWORD"/>:</label>
-                    </td>
-                    <td>
-                        <form:password path="password" id="password"/>
-                        <form:errors path="password" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">
-                        <span class="fieldRequired">*</span>
-                        <label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/>:</label>
-                    </td>
-                    <td>
-                        <form:password path="retypePassword" id="retypePassword"/>
-                        <form:errors path="retypePassword" cssClass="errorMsg"/>
-                    </td>
-                </tr>
-                <c:if test="${requestScope.captchaEnabled}">
-                    <tr>
-                        <td class="formLabel">
-                        </td>
-                        <td>
-                            <form:errors path="captcha" cssClass="errorMsg"/>
-                                ${requestScope.captchaHtml}
-                        </td>
-                    </tr>
-                </c:if>
-                <tr>
-                    <td class="formLabel">
-                        <spring:message code="TERM_OF_THE_SERVICE"/>
-                    </td>
-                    <td>
-                        <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/>
-                        <a href="termsOfUse.htm">
-                            <spring:message code="HERE"/>
-                        </a>.<br/>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="formLabel">&nbsp;</td>
-                    <td>
-                        <spring:message code="REGISTRATION_CLICK_ADVICE"/>
-                    </td>
-                </tr>
-                <tr>
-                    <td>&nbsp;</td>
-                    <td><input type="submit" value="<spring:message code="REGISTER"/>" id="submitButton"
-                               class="btn-primary">
-                        <input type="button" value="<spring:message code="CANCEL"/>"
-                               onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn-secondary">
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </form:form>
+        <fieldset>
+            <label for="email"><spring:message code="EMAIL"/></label>
+                <form:input path="email" id="email" type="email" required="required"/>
+                <form:errors path="email" cssClass="errorMsg"/>
+
+            <label for="username"> <spring:message code="USERNAME"/></label>
+                <form:input path="username" id="username" required="required"/>
+                <form:errors path="username" cssClass="errorMsg"/>
+
+
+            <label for="firstname"><spring:message code="FIRSTNAME"/></label>
+                <form:input path="firstname" id="firstname" required="required"/>
+                <form:errors path="firstname" cssClass="errorMsg"/>
+
+            <label for="lastname"><spring:message code="LASTNAME"/></label>
+                <form:input path="lastname" id="lastname" required="required"/>
+                <form:errors path="lastname" cssClass="errorMsg"/>
+
+            <label for="password"><spring:message code="PASSWORD"/></label>
+                <form:password path="password" id="password" required="required"/>
+                <form:errors path="password" cssClass="errorMsg"/>
+
+            <label for="retypePassword"><spring:message code="RETYPE_PASSWORD"/></label>
+                <form:password path="retypePassword" id="retypePassword"/>
+                <form:errors path="retypePassword" cssClass="errorMsg"/>
+
+            <c:if test="${requestScope.captchaEnabled}">
+                <form:errors path="captcha" cssClass="errorMsg"/>
+                ${requestScope.captchaHtml}
+            </c:if>
+
+            <div>
+                <p>
+                    <spring:message code="TERM_OF_THE_SERVICE"/>
+                    <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="termsOfUse.htm"><spring:message
+                        code="HERE"/></a>
+                    <spring:message code="REGISTRATION_CLICK_ADVICE"/>
+                </p>
+            </div>
+
+            <input type="submit" value="<spring:message code="REGISTER" />" id="submitButton"
+                   class="btn btn-primary">
+            <input type="button" value="<spring:message code="CANCEL"/>"
+                   onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn">
+            </form:form>
     </div>
 </div>