diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/public/templates/bootstrap/account/edit/cashout.tpl
old mode 100644
new mode 100755
index fc0f0c9a..e843b2ef
--- a/public/templates/bootstrap/account/edit/cashout.tpl
+++ b/public/templates/bootstrap/account/edit/cashout.tpl
@@ -28,25 +28,27 @@
               <label>4 digit PIN</label>
               <input class="form-control" type="password" name="authPin" size="4" maxlength="4" />
             </div>
-            {nocache}
-            <input type="hidden" name="wf_token" value="{$smarty.request.wf_token|escape|default:""}">
-            <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-            <input type="hidden" name="utype" value="withdraw_funds">
-            {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw}
-            {if $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1}
-            <input type="submit" value="Cash Out" class="btn btn-outline btn-success btn-lg btn-block">
-            {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 1 || $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 0}
-            <input type="submit" value="Cash Out" class="btn btn-outline btn-danger btn-lg btn-block" disabled>
-            {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 0}
-            <input type="submit" value="Unlock" class="btn btn-outline btn-warning btn-lg btn-block" name="unlock">
-            {/if}
-            {else}
-            <input type="submit" value="Cash Out" class="btn btn-outline btn-success btn-lg btn-block">
-            {/if}
-            {/nocache}
           </div>
         </div>
-      </div>      
+      </div>
+      <div class="panel-footer">
+      {nocache}
+      <input type="hidden" name="wf_token" value="{$smarty.request.wf_token|escape|default:""}">
+      <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
+      <input type="hidden" name="utype" value="withdraw_funds">
+      {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw}
+      {if $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1}
+      <input type="submit" value="Cash Out" class="btn btn-success">
+      {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 1 || $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 0}
+      <input type="submit" value="Cash Out" class="btn btn-danger" disabled>
+      {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 0}
+      <input type="submit" value="Unlock" class="btn btn-warning" name="unlock">
+      {/if}
+      {else}
+      <input type="submit" value="Cash Out" class="btn btn-success">
+      {/if}
+      {/nocache}
+      </div>
     </div>
   </div>
 </form>
diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/public/templates/bootstrap/account/edit/detail.tpl
old mode 100644
new mode 100755
index 4d765a80..90839719
--- a/public/templates/bootstrap/account/edit/detail.tpl
+++ b/public/templates/bootstrap/account/edit/detail.tpl
@@ -60,25 +60,28 @@
               <font size="1">The 4 digit PIN you chose when registering</font>
               <input class="form-control" type="password" name="authPin" size="4" maxlength="4">
             </div>
-            {nocache}
-            <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-            <input type="hidden" name="ea_token" value="{$smarty.request.ea_token|escape|default:""}">
-            <input type="hidden" name="utype" value="account_edit">
-            {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details}
-            {if $DETAILSSENT == 1 && $DETAILSUNLOCKED == 1}
-            <input type="submit" value="Update Account" class="btn btn-outline btn-success btn-lg btn-block">
-            {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 1 || $DETAILSSENT == 1 && $DETAILSUNLOCKED == 0}
-            <input type="submit" value="Update Account" class="btn btn-outline btn-danger btn-lg btn-block" disabled>
-            {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 0}
-            <input type="submit" value="Unlock" class="btn btn-outline btn-warning btn-lg btn-block" name="unlock">
-            {/if}
-            {else}
-            <input type="submit" value="Update Account" class="btn btn-outline btn-success btn-lg btn-block">
-            {/if}
-            {/nocache}
+            
           </div>
         </div>
       </div>
+      <div class="panel-footer">
+      {nocache}
+      <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
+      <input type="hidden" name="ea_token" value="{$smarty.request.ea_token|escape|default:""}">
+      <input type="hidden" name="utype" value="account_edit">
+      {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details}
+      {if $DETAILSSENT == 1 && $DETAILSUNLOCKED == 1}
+      <input type="submit" value="Update Account" class="btn btn-success">
+      {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 1 || $DETAILSSENT == 1 && $DETAILSUNLOCKED == 0}
+      <input type="submit" value="Update Account" class="btn btn-danger" disabled>
+      {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 0}
+      <input type="submit" value="Unlock" class="btn btn-warning" name="unlock">
+      {/if}
+      {else}
+      <input type="submit" value="Update Account" class="btn btn-success">
+      {/if}
+      {/nocache}
+      </div>
     </div>
   </div>
 </form>
diff --git a/public/templates/bootstrap/account/edit/password.tpl b/public/templates/bootstrap/account/edit/password.tpl
old mode 100644
new mode 100755
index b4fbac4a..2b00c6d8
--- a/public/templates/bootstrap/account/edit/password.tpl
+++ b/public/templates/bootstrap/account/edit/password.tpl
@@ -33,25 +33,28 @@
               <label>4 digit PIN</label>
               <input class="form-control" type="password" name="authPin" size="4" maxlength="4" />
             </div>
-            {nocache}
-            <input type="hidden" name="cp_token" value="{$smarty.request.cp_token|escape|default:""}">
-            <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-            <input type="hidden" name="utype" value="change_pw">
-            {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.changepw}
-            {if $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 1}
-            <input type="submit" value="Change Password" class="btn btn-outline btn-success btn-lg btn-block">
-            {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 1 || $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 0}
-            <input type="submit" value="Change Password" class="btn btn-outline btn-danger btn-lg btn-block" disabled>
-            {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 0}
-            <input type="submit" value="Unlock" class="btn btn-outline btn-warning btn-lg btn-block" name="unlock">
-            {/if}
-            {else}
-            <input type="submit" value="Change Password" class="btn btn-outline btn-success btn-lg btn-block">
-            {/if}
-            {/nocache}
+
           </div>
         </div>
       </div>
+      <div class="panel-footer">
+        {nocache}
+        <input type="hidden" name="cp_token" value="{$smarty.request.cp_token|escape|default:""}">
+        <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
+        <input type="hidden" name="utype" value="change_pw">
+        {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.changepw}
+        {if $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 1}
+        <input type="submit" value="Change Password" class="btn btn-success">
+        {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 1 || $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 0}
+        <input type="submit" value="Change Password" class="btn btn-danger" disabled>
+        {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 0}
+        <input type="submit" value="Unlock" class="btn btn-warning" name="unlock">
+        {/if}
+        {else}
+        <input type="submit" value="Change Password" class="btn btn-success">
+        {/if}
+        {/nocache}
+      </div>
     </div>
   </div>
 </form>
\ No newline at end of file
diff --git a/public/templates/bootstrap/account/edit/resetpin.tpl b/public/templates/bootstrap/account/edit/resetpin.tpl
old mode 100644
new mode 100755
index 601e7974..f7b52cdc
--- a/public/templates/bootstrap/account/edit/resetpin.tpl
+++ b/public/templates/bootstrap/account/edit/resetpin.tpl
@@ -11,14 +11,16 @@
       <div class="panel-body">
         <div class="row">
           <div class="col-lg-12">
-            <div class="form-group"">
+            <div class="form-group">
               <label>Current Password</label>
-              <input class="form-control" type="password" name="currentPassword" />
+              <input class="form-control" type="password" name="currentPassword">
             </div>
-            <input type="submit" class="btn btn-outline btn-success btn-lg btn-block" value="Reset PIN">
           </div>
         </div>
       </div>
+      <div class="panel-footer">
+        <input type="submit" class="btn btn-success" value="Reset PIN">
+      </div>
     </div>
   </div>
 </form>
\ No newline at end of file
diff --git a/public/templates/bootstrap/account/notifications/default.tpl b/public/templates/bootstrap/account/notifications/default.tpl
index 97536df8..28dd4811 100755
--- a/public/templates/bootstrap/account/notifications/default.tpl
+++ b/public/templates/bootstrap/account/notifications/default.tpl
@@ -10,7 +10,7 @@
           <input type="hidden" name="action" value="{$smarty.request.action|escape}">
           <input type="hidden" name="do" value="save">
           <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
-          <table class="table borderless">
+          <table class="table table-striped table-bordered table-hover">
             <tr>
               <td>
                 <label>IDLE Worker</label>
@@ -86,7 +86,7 @@
                 <th>Active</th>
               </tr>
             </thead>
-            <tbody style="font-size:12px;">
+            <tbody>
 {section notification $NOTIFICATIONS}
               <tr>
                 <td>{$NOTIFICATIONS[notification].id}</td>