diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
index 5d1c66b6..5f98e768 100644
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ b/wise-webapp/src/main/webapp/css/mindmapList.less
@@ -177,7 +177,7 @@ input#selectAll {
 span.starredOff {
     background: url('../images/star-off.png') no-repeat center left;
     padding: 10px;
-    margin: 0 0px 0 5px;
+    margin: 0 0 0 10px;
 }
 
 span.starredOff:hover {
@@ -187,7 +187,7 @@ span.starredOff:hover {
 span.starredOn {
     background: url('../images/star-on.png') no-repeat center left;
     padding: 10px;
-    margin: 0 0px 0 5px;
+    margin: 0 0 0 10px;
 }
 
 span.starredOn:hover {
@@ -212,4 +212,14 @@ abbr[title] {
 
 #foldersContainer {
     padding-top: 60px;
-}
\ No newline at end of file
+}
+
+#footerContainer > ul {
+   padding:0px;
+   margin:0px;
+}
+#footerContainer > li.active {
+   padding:0px;
+   margin:0px;
+}
+
diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css
index d61cea6b..b31520bc 100644
--- a/wise-webapp/src/main/webapp/css/pageHeaders.css
+++ b/wise-webapp/src/main/webapp/css/pageHeaders.css
@@ -18,7 +18,7 @@ html,body {
 }
 
 #headerToolbar {
-    height: 30px;
+    height: 35px;
     width: 100%;
     background-color: #171a17;
     border-top: 1px solid #999999;
@@ -36,7 +36,7 @@ html,body {
 }
 
 #headerLogo {
-    margin-top: 18px;
+    margin-top: 23px;
     height: 80px;
     width: 160px;
     background: url("../images/logo-medium.png") no-repeat;
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 3d29d720..9a970041 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -23,30 +23,25 @@
         <form action="<c:url value='/c/j_spring_security_check'/>" method="POST" class="form-horizontal" id="loginForm">
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="email"><spring:message code="EMAIL"/></label>
-                <div class="col-md-12">
+                <div class="col-md-10">
                     <input type='email' tabindex="1" id="email" name='j_username' required="required" class="form-control"/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
-                <div class="col-md-12">
+                <div class="col-md-10">
                     <input type='password' tabindex="2" id="password" name='j_password' required="required" class="form-control"/>
                 </div>
             </div>
-            <div class="form-group" style="text-align: right">
-
-                <label>
-                    <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"
-                           tabindex="3"/> <spring:message code="REMEMBER_ME"/>
-                </label>
-
-                <div style="text-align: center">
-                    <a href="<c:url value="/c/user/resetPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
+            <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 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>
@@ -64,7 +59,7 @@
 </div>
 
 <div class="row">
-    <div id="register" class="col-md-12">
+    <div id="register" class="col-md-10">
         <c:if test="${requestScope['security.type']=='db'}">
             <b><spring:message code="NOT_READY_A_USER"/></b>
             <spring:message code="NOT_READY_A_USER_MESSAGE"/>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index f3e33a3e..55c64ecf 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -88,7 +88,7 @@
 
             // Customize search action ...
             $('#mindmapListTable_filter').appendTo("#tableActions");
-            $('#mindmapListTable_filter input').addClass('input-medium search-query');
+            $('#mindmapListTable_filter input').addClass('input-medium search-query form-control');
             $('#mindmapListTable_filter input').attr('placeholder', 'Search');
             $("#mindmapListTable_info").appendTo("#pageInfo");
 
@@ -132,7 +132,6 @@
     <div class="col-md-1"></div>
     <div class="col-md-2" id="foldersContainer">
         <ul class="nav nav-list">
-            <li class="nav-header"><spring:message code="FILTERS"/></li>
             <li data-filter="all" class="active"><a href="#"><i class="glyphicon glyphicon-inbox glyphicon-white"></i> <spring:message
                     code="ALL_MAPS"/></a></li>
             <li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message code="MY_MAPS"/></a>