diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
index 5a4022b5..a073d19e 100755
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -35,8 +35,11 @@
                             <input type="text" name="lastname" id="lastname" required="required" class="form-control" value="${user.lastname}"/>
                         </div>
                     </div>
-                    <br/>
-                    <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
+                    <div class="form-group">
+                        <div class="col-sm-offset-8 col-sm-2">
+                            <input type="submit" id="changeUserInfoBtn" class="btn btn-primary" class="form-control" value="<spring:message code="SAVE_CHANGES"/>"/>
+                        <div>
+                    </div>
                 </fieldset>
             </form>
 
@@ -58,8 +61,11 @@
                             <input type="password" name="password" id="repassword" required="required" class="form-control"/>
                         </div>
                     </div>
-                    <br/>
-                    <input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/>
+                    <div class="form-group">
+                        <div class="col-sm-offset-8 col-sm-2">
+                            <input type="submit" id="changePasswordBtn" class="btn btn-primary" value="<spring:message code="CHANGE_PASSWORD"/>"/>
+                        </div>
+                    </div>
                 </fieldset>
             </form>
         </div>
@@ -67,7 +73,6 @@
             <div id="languageMsg" class="alert">
             </div>
             <form action="#" method="POST" id="languageForm" class="form-horizontal">
-                <fieldset>
                 <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">
@@ -100,20 +105,19 @@
                         </option>
                     </select></div>
                     </div>
-                    <br/>
-                    <input type="submit" id="changeLanguageBtn" class="btn btn-primary"
-                           value="<spring:message code="CHANGE_LANGUAGE"/>"/>
-                </fieldset>
+                    <div class="form-group">
+                        <div class="col-sm-offset-8 col-sm-2">
+                            <input type="submit" id="changeLanguageBtn" class="btn btn-primary" value="<spring:message code="CHANGE_LANGUAGE"/>"/>
+                        </div>
+                    </div>
             </form>
         </div>
         <div class="tab-pane fade" id="deleteAccountPanel">
             <div id="deleteAccountMsg" class="alert alert-danger" style="display: block;"><spring:message code="WARNING_DELETE_USER"/></div>
             <form action="#" method="POST" id="deleteAccountForm">
-                <fieldset>
-                    <input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>
-                    <input type="submit" id="deleteAccountBtn" class="btn btn-primary"
-                           value="<spring:message code="DELETE__ACCOUNT"/>"/>
-                </fieldset>
+                <div class="form-group" style="text-align:right">
+                     <input type="checkbox" name="confirmAccountDelete" id="accountMarkedForDelete" required="required"/>   <input type="submit" id="deleteAccountBtn" class="btn btn-primary" value="<spring:message code="DELETE__ACCOUNT"/>"/>
+                </div>
             </form>
         </div>
     </div>
diff --git a/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp b/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
index 7a90cc0f..5019d3f3 100644
--- a/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
+++ b/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
@@ -29,15 +29,15 @@
 <div class="row">
     <div id="login" class="fform col-md-8">
         <form action="/c/j_spring_openid_security_check" method="get" id="openid_form">
-            <input type="hidden" name="action" value="verify"/>
+            <input type="hidden" name="action" value="verify" class="form-control"/>
             <fieldset>
                 <div id="openid_choice">
                     </br>
                     <div id="openid_btns"></div>
                 </div>
                 <div id="openid_input_area">
-                    <input id="openid_identifier" name="openid_identifier" type="text" value="http://"/>
-                    <input id="openid_submit" type="submit" value="Sign-In"/>
+                    <input id="openid_identifier" name="openid_identifier" type="text" value="http://" class="form-control"/>
+                    <input id="openid_submit" type="submit" value="Sign-In" class="form-control" class="btn-primary btn"/>
                 </div>
                 <noscript>
                     <p>OpenID is service that allows you to log-on to many different websites using a single indentity.
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
index ab76b7e4..304d5812 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp
@@ -3,8 +3,7 @@
 
 <style type="text/css">
     #wizardContainer input {
-        width: 50px;
-        height: 25px;
+        width: 80px;
         display: inline-block;
     }
 </style>
@@ -27,21 +26,24 @@
         <li class="active"><a href="#embedTab" data-toggle="pill"><spring:message code="EMBED"/></a></li>
         <li><a href="#publicUrlTab" data-toggle="pill"><spring:message code="PUBLIC_URL"/></a></li>
     </ul>
-
+    <br/>
     <div class="tab-content">
         <div class="tab-pane fade active in" id="embedTab">
             <spring:message code="BLOG_INCLUSION"/>
             <div id="wizardContainer">
                 <form class="form-inline" action="#">
-                    <label for="frameWidth"><spring:message code="FRAME_WIDTH"/>:</label>
-                    <input type="number" id="frameWidth" name="frameWidth" value="600" class="col-md-2" min="0"/>
-
-                    <label for="frameHeight"><spring:message code="FRAME_HEIGHT"/>:</label>
-                    <input type="number" id="frameHeight" name="frameHeight" value="400" class="col-md-2" min="0"/>
-
-                    <label for="mapZoom"><spring:message code="ZOOM"/> %:</label>
-                    <input type="number" id="mapZoom" name="mapZoom" value="80" class="col-md-2" min="10" max="200"
-                           step="10"/>
+                    <div class="form-group">
+                    <label for="frameWidth" class="form-label"><spring:message code="FRAME_WIDTH"/>:</label>
+                    <input type="number" id="frameWidth" name="frameWidth" value="600" class="col-md-2 form-control" min="0"/>
+                     </div>
+                    <div class="form-group">
+                    <label for="frameHeight" class="form-label"><spring:message code="FRAME_HEIGHT"/>:</label>
+                    <input type="number" id="frameHeight" name="frameHeight" value="400" class="col-md-2 form-control" min="0"/>
+                    </div>
+                    <div class="form-group">
+                    <label for="mapZoom" class="form-label"><spring:message code="ZOOM"/> %:</label>
+                    <input type="number" id="mapZoom" name="mapZoom" value="80" class="col-md-2 form-control" min="10" max="200" step="10"/>
+                    </div>
                 </form>
             </div>
             <label><spring:message code="BLOG_SNIPPET"/></label>
@@ -53,7 +55,7 @@ solid black" src="${baseUrl}/c/maps/${mindmap.id}/embed?zoom=1"&gt; &lt;/iframe&
             <p><spring:message code="DIRECT_LINK_EXPLANATION"/></p>
             <input name="url" value="${baseUrl}/c/maps/${mindmap.id}/public"
                    style="width:400px;cursor: text"
-                   readonly="readonly"/>
+                   readonly="readonly" class="form-control"/>
         </div>
     </div>
 </div>