diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
index a073d19e..4b5cc92d 100755
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -18,25 +18,25 @@
             <form action="#" method="POST" id="changeUserForm" class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="email" class="col-sm-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label>
-                        <div class="col-sm-8">
+                        <label for="email" class="col-md-3 control-label"><strong><spring:message code="EMAIL"/>:</strong></label>
+                        <div class="col-md-8">
                             <input type="text" name="password" id="email" required="required" class="form-control" readonly="readonly" value="${user.email}"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="firstname" class="col-sm-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
-                        <div class="col-sm-8">
+                        <label for="firstname" class="col-md-3 control-label"><strong><spring:message code="FIRSTNAME"/>:</strong></label>
+                        <div class="col-md-8">
                             <input type="text" name="firstname" id="firstname" required="required" class="form-control" value="${user.firstname}"/>
                          </div>
                     </div>
                     <div class="form-group">
-                        <label for="lastname" class="col-sm-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label>
-                        <div class="col-sm-8">
+                        <label for="lastname" class="col-md-3 control-label"><strong><spring:message code="LASTNAME"/>:</strong></label>
+                        <div class="col-md-8">
                             <input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
+                        <div class="col-md-offset-8 col-md-2">
                             <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
                         <div>
                     </div>
@@ -50,19 +50,19 @@
             <form action="#" method="POST" id="changePasswordForm"  class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="password" class="col-sm-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
-                        <div class="col-sm-8">
+                        <label for="password" class="col-md-3 control-label"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
+                        <div class="col-md-8">
                             <input type="password" name="password" id="password" required="required" class="form-control"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="repassword" class="col-sm-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
-                        <div class="col-sm-8">
+                        <label for="repassword" class="col-md-3 control-label"><strong><spring:message code="CONFIRM_NEW_PASSWORD"/>:</strong></label>
+                        <div class="col-md-8">
                             <input type="password" name="password" id="repassword" required="required" class="form-control"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
+                        <div class="col-md-offset-8 col-md-2">
                             <input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/>
                         </div>
                     </div>
@@ -74,8 +74,8 @@
             </div>
             <form action="#" method="POST" id="languageForm" class="form-horizontal">
                 <div class="form-group">
-                    <label for="language" class="col-sm-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label>
-                    <div class="col-sm-8">
+                    <label for="language" class="col-md-3 control-label"><strong><spring:message code="LANGUAGE"/>:</strong></label>
+                    <div class="col-md-8">
                     <select name="language" id="language" class="form-control">
                         <option value="en">English</option>
                         <option value="es" <c:if test="${user.locale=='es'}">selected="selected" </c:if>>Spanish -
@@ -106,7 +106,7 @@
                     </select></div>
                     </div>
                     <div class="form-group">
-                        <div class="col-sm-offset-8 col-sm-2">
+                        <div class="col-md-offset-8 col-md-2">
                             <input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/>
                         </div>
                     </div>
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index d3c65436..f20f4271 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -22,13 +22,13 @@
 
         <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>
+                <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"/>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-2 control-label" for="password"><spring:message code="PASSWORD"/></label>
+                <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>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
index c6e241fc..d9c84cbd 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
@@ -9,22 +9,22 @@
         <div class="errorMessage"></div>
         <fieldset>
             <div class="form-group">
-                <label for="mapFile" class="control-label col-sm-2 "><spring:message code="MIND_FILE"/>: </label>
-                <div class="col-sm-10">
+                <label for="mapFile" class="control-label col-md-2 "><spring:message code="MIND_FILE"/>: </label>
+                <div class="col-md-10">
                     <input type="file" name="file" id="mapFile" required="required" class="form-control"/>
                 </div>
             </div>
             <div class="form-group">
-                <label for="title" class="control-label col-sm-2 "><spring:message code="NAME"/>: </label>
-                <div class="col-sm-10">
+                <label for="title" class="control-label col-md-2 "><spring:message code="NAME"/>: </label>
+                <div class="col-md-10">
                    <input type="text" id="title" name="title" required="required"
                            placeholder="<spring:message code="MAP_NAME_HINT"/>"
                            class="form-control" maxlength="255"/>
                 </div>
             </div>
             <div class="form-group">
-                <label for="description" class="control-label col-sm-2"><spring:message code="DESCRIPTION"/>: </label>
-                <div class="col-sm-10">
+                <label for="description" class="control-label col-md-2"><spring:message code="DESCRIPTION"/>: </label>
+                <div class="col-md-10">
                     <textarea type="text" name="description" id="description"
                           placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea>
                 </div>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 55c64ecf..a78ac23d 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -239,14 +239,14 @@
             <form class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label>
-                        <div class="col-sm-8">
+                        <label class="col-md-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label>
+                        <div class="col-md-8">
                             <input class="form-control" name="title" id="newTitle" type="text" required="required" placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus" maxlength="255"/>
                          </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
-                        <div class="col-sm-8">
+                        <label class="col-md-3 control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
+                        <div class="col-md-8">
                             <input class="form-control" name="description" id="newDec" type="text" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
                         </div>
                     </div>
@@ -277,17 +277,17 @@
             <form class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="title" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label>
-                        <div class="col-sm-8">
+                        <label for="title" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
+                        <div class="col-md-8">
                             <input name="title" id="title" type="text" required="required"
                                    placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus"
                                    class="form-control" maxlength="255"/>
                          </div>
                     </div>
                     <div class="form-group">
-                        <label for="description" class="col-sm-3 control-label"><spring:message
+                        <label for="description" class="col-md-3 control-label"><spring:message
                                 code="DESCRIPTION"/>: </label>
-                        <div class="col-sm-8">
+                        <div class="col-md-8">
                             <input name="description" id="description" type="text"
                                    placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"/>
                         </div>
@@ -317,16 +317,16 @@
             <form class="form-horizontal">
                 <fieldset>
                     <div class="form-group">
-                        <label for="renTitle" class="col-sm-3 control-label"><spring:message code="NAME"/>: </label>
-                        <div class="col-sm-8">
+                        <label for="renTitle" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
+                        <div class="col-md-8">
                             <input name="title" id="renTitle" required="required" autofocus="autofocus"
                                    class="form-control" maxlength="255"/>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="renDescription" class="col-sm-3 control-label"><spring:message
+                        <label for="renDescription" class="col-md-3 control-label"><spring:message
                                 code="DESCRIPTION"/>:</label>
-                        <div class="col-sm-8">
+                        <div class="col-md-8">
                             <input name="description" class="form-control" id="renDescription" maxlength="255"/>
                         </div>
                     </div>
diff --git a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
index f163f096..9d36a8a4 100755
--- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
@@ -19,8 +19,8 @@
 
         <form:form method="post" commandName="resetPassword"  class="form-horizontal">
             <fieldset>
-                <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
-                <div class="col-sm-5">
+                <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"
diff --git a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
index 38bcac93..18b094d0 100644
--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@@ -9,42 +9,42 @@
     <form:form method="post" commandName="user" class="form-horizontal">
     <fieldset>
         <div class="form-group">
-            <label for="email" class="col-sm-2 control-label"><spring:message code="EMAIL"/>: </label>
-            <div class="col-sm-5">
+            <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-sm-2 control-label"><spring:message code="FIRSTNAME"/>: </label>
-            <div class="col-sm-5">
+            <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-sm-2 control-label"><spring:message code="LASTNAME"/>: </label>
-            <div class="col-sm-5">
+            <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-sm-2 control-label"><spring:message code="PASSWORD"/>: </label>
-            <div class="col-sm-5">
+            <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-sm-2 control-label"><spring:message code="RETYPE_PASSWORD"/>: </label>
-            <div class="col-sm-5">
+            <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-sm-10 col-sm-offset-2">
+            <div class="col-md-10 col-md-offset-2">
                 <c:if test="${requestScope.captchaEnabled}">
                     ${requestScope.captchaHtml}
                 <p>
@@ -63,7 +63,7 @@
             </p>
         </div>
         <div class="form-group">
-            <div class="col-sm-offset-2 col-sm-10">
+            <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">