diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index a97a718211..e08c3966d1 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -19,7 +19,7 @@ $lang->group->manageView         = 'View';
 $lang->group->managePriv         = 'Batch Assign Privileges';
 $lang->group->managePrivByGroup  = 'Privilege';
 $lang->group->managePrivByModule = 'Module Privileges';
-$lang->group->byModuleTips       = '<span class="tips">(Press Shift/Control to Multi-select)</span>';
+$lang->group->byModuleTips       = '<span class="tips">(Press Shift/Ctrl to Multi-select)</span>';
 $lang->group->manageMember       = 'Member';
 $lang->group->confirmDelete      = 'Do you want to delete this User Group?';
 $lang->group->successSaved       = 'Saved!';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index d95bbdc9f8..625b6d8da3 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -19,7 +19,7 @@ $lang->group->manageView         = '视图维护';
 $lang->group->managePriv         = '权限维护';
 $lang->group->managePrivByGroup  = '权限维护';
 $lang->group->managePrivByModule = '按模块分配权限';
-$lang->group->byModuleTips       = '<span class="tips">（可以按住Shift或者Control键进行多选）</span>';
+$lang->group->byModuleTips       = '<span class="tips">（可以按住Shift或者Ctrl键进行多选）</span>';
 $lang->group->manageMember       = '成员维护';
 $lang->group->confirmDelete      = '您确定删除该用户分组吗？';
 $lang->group->successSaved       = '成功保存';
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 14b83a9f80..acfc3526be 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -59,7 +59,7 @@
             </td>
           </tr>
           <tr>
-            <td class='text-center' colspan='2'>
+            <td class='text-center form-actions' colspan='2'>
               <?php 
               echo html::submitButton('', '', 'btn btn-wide btn-primary');
               echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 46da81db24..2a6ffa35a4 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -63,7 +63,7 @@
       </tr>
       <tr>
         <th><span class='hidden'><?php echo html::selectAll('', 'checkbox')?></span></th>
-        <td colspan='2'>
+        <td colspan='2' class='form-actions'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index 0d36b15c26..d590b774f1 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -36,7 +36,7 @@
       </tr>
       <tr>
         <th class='text-right'></th>
-        <td>
+        <td class='form-actions'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
@@ -120,7 +120,7 @@
             <label class='text-right' for='allChecker'><?php echo $lang->selectAll;?></label>
           </div>
         </th>
-        <td>
+        <td class='form-actions'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
diff --git a/module/group/view/privbymodule.html.php b/module/group/view/privbymodule.html.php
index 091d7a8c4d..4bb1eb8343 100644
--- a/module/group/view/privbymodule.html.php
+++ b/module/group/view/privbymodule.html.php
@@ -40,7 +40,7 @@
         <td><?php echo html::select('groups[]', $groups, '', "multiple='multiple' class='form-control'");?></td>
       </tr>
       <tr>
-        <td class='text-center' colspan='3'>
+        <td class='text-center form-actions' colspan='3'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
           <?php echo html::backButton('', '', 'btn btn-wide');?>
           <?php echo html::hidden('foo'); // Just make $_POST not empty..?>
diff --git a/module/mail/view/ztcloud.html.php b/module/mail/view/ztcloud.html.php
index 1b531d5a30..4fd8c54858 100644
--- a/module/mail/view/ztcloud.html.php
+++ b/module/mail/view/ztcloud.html.php
@@ -60,7 +60,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
             <?php
             if($this->config->mail->turnon and $mailExist) echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-wide'");
diff --git a/module/message/control.php b/module/message/control.php
index fc52903600..3660201f7b 100644
--- a/module/message/control.php
+++ b/module/message/control.php
@@ -44,7 +44,7 @@ class message extends control
             $data = fixer::input('post')->get();
             $data->messageSetting = json_encode($data->messageSetting);
             $this->loadModel('setting')->setItem('system.message.setting', $data->messageSetting);
-            die(js::reload('parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
         }
 
         $this->loadModel('webhook');
diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php
index 6568907b7a..b810cbca09 100644
--- a/module/message/view/setting.html.php
+++ b/module/message/view/setting.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include './header.html.php';?>
 <div id='mainContent' class='main-content'>
-  <form target='hiddenwin' method='post'>
+  <form class='load-indicator main-form form-ajax' method='post'>
     <table class='table table-bordered'>
       <thead>
         <th></th>
@@ -70,7 +70,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
+          <td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
         </tr>
       </tfoot>
     </table>
diff --git a/module/my/view/changepassword.html.php b/module/my/view/changepassword.html.php
index d9dffbb74f..d26b45e9ab 100755
--- a/module/my/view/changepassword.html.php
+++ b/module/my/view/changepassword.html.php
@@ -39,7 +39,7 @@
         <td><?php echo html::password('password2', '', "class='form-control'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
       </tr>
     </table>
     <?php if(!empty($this->app->user->modifyPasswordReason)):?>
diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php
index 38f949e214..b240520ae8 100644
--- a/module/my/view/editprofile.html.php
+++ b/module/my/view/editprofile.html.php
@@ -103,7 +103,7 @@
         </td>
       </tr>
     </table>
-    <div class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');?></div>
+    <div class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></div>
   </form>
   <?php echo html::hidden('verifyRand', $rand);?>
 </div>
diff --git a/module/my/view/managecontacts.html.php b/module/my/view/managecontacts.html.php
index 6f8507d621..85695a0d43 100644
--- a/module/my/view/managecontacts.html.php
+++ b/module/my/view/managecontacts.html.php
@@ -88,7 +88,7 @@
               <td></td>
               <td class="form-actions">
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('mode', $mode);?>
-              <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger'");?>
+              <?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?>
               </td>
             </tr>
             <?php endif;?>
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php
index 50b1c542be..2494b33b30 100755
--- a/module/product/view/batchedit.html.php
+++ b/module/product/view/batchedit.html.php
@@ -70,7 +70,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="<?php echo count($visibleFields) + 4?>" class="text-center">
+          <td colspan="<?php echo count($visibleFields) + 4?>" class="text-center form-actions">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 8589b68297..03180d36dc 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -29,7 +29,7 @@
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center'>
+        <td colspan='2' class='text-center form-actions'>
           <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
           <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
         </td>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 47189f0a1f..b8ceecdfcb 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -82,7 +82,7 @@
             <td colspan='2'><?php echo html::checkbox('whitelist', $groups, '', '', 'inline');?></td>
           </tr>  
           <tr>
-            <td colspan='3' class='text-center'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 33b627bb72..de9b60344e 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -71,7 +71,7 @@
             <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $product->whitelist);?></td>
           </tr>  
           <tr>
-            <td colspan='3' class='text-center'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php
index baa4c55c3f..bce1af1aa6 100644
--- a/module/productplan/view/batchedit.html.php
+++ b/module/productplan/view/batchedit.html.php
@@ -40,7 +40,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='5' class="text-center">
+          <td colspan='5' class="text-center form-actions">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index e1a890bca1..c719c39ecf 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -57,7 +57,7 @@
             <td colspan='3'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>
           <tr>
-            <td colspan='4' class='text-center'>
+            <td colspan='4' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $product->id);?>
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index 94523ccc5f..3470a04528 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -54,7 +54,7 @@
         <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td class='text-center' colspan='6'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td class='text-center form-actions' colspan='6'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/project/view/ajaxkanbansetting.html.php b/module/project/view/ajaxkanbansetting.html.php
index bb685d3bcf..e5191b3910 100644
--- a/module/project/view/ajaxkanbansetting.html.php
+++ b/module/project/view/ajaxkanbansetting.html.php
@@ -40,7 +40,7 @@
         </tr>
         <?php endif;?>
         <tr>
-          <td colspan='2' class='text-center'>
+          <td colspan='2' class='text-center form-actions'>
             <?php
             echo html::submitButton('', '', 'btn btn-wide btn-primary');
             echo '&nbsp;' . html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn btn-wide'");
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 6182a1d640..14919c0629 100755
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -84,7 +84,7 @@
         <?php endforeach;?>
       </tbody>
       <tfoot>
-        <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+        <tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
       </tfoot>
     </table>
   </form>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index cad1624d0e..10ce5614d1 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -30,7 +30,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index dd20dfdc38..b0ef7eda09 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -145,7 +145,7 @@
           <th><?php echo $lang->project->whitelist;?></th>
           <td colspan='2'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
         </tr>
-        <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index c0efa66c44..45652db69a 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -120,7 +120,7 @@
         <?php $i ++; $memberCount ++;?>
         <?php endfor;?>
       </tbody>
-      <tfoot><tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
+      <tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
     </table>
     <?php js::set('i', $i);?>
   </form>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index e6f1ca2f1a..1ebe31b986 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -59,7 +59,7 @@
           <?php endforeach;?>
         </div>
       </div>
-      <div class="detail text-center">
+      <div class="detail text-center form-actions">
         <?php echo html::hidden("post", 'post');?>
         <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
       </div>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index d7452f362e..dd4cff4d9a 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -60,7 +60,7 @@
           <td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='4' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index d42b91b782..f84cc21145 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -30,7 +30,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton($lang->project->start, '', 'btn btn-wide btn-primary') . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton($lang->project->start, '', 'btn btn-wide btn-primary') . ' ' .  html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </tbody>
     </table>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index dd12db2016..ae314f77b9 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -29,7 +29,7 @@
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
-        <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+        <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
       </tr>
     </table>
   </form>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 7daf7a0979..f0df364ff9 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -48,7 +48,7 @@
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
           </tr>  
           <tr>
-            <td colspan='3' class='text-center'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index b860913653..eae4e9b862 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -56,7 +56,7 @@
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
           </tr>  
           <tr>
-            <td colspan='3' class='text-center'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
               <?php echo html::hidden('product', $release->product);?>
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index 5807546adf..70c9bc9156 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -43,7 +43,7 @@
           <td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php 
             echo html::submitButton($lang->story->activate, '', 'btn btn-wide btn-success');
             echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 54726ca30c..fd6cf4c384 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -41,7 +41,7 @@
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide');?>
           </td>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index b9399f37bc..7364631108 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -184,7 +184,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="5" class="text-center">
+            <td colspan="5" class="text-center form-actions">
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 97678c276f..aacb92d9e9 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -22,7 +22,7 @@
         <?php include '../../common/view/customfield.html.php';?>
       </div>
     </div>
-    <form class='load-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
+    <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
         <tr>
           <th><?php echo $lang->task->type;?></th>
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index 63d4ea93be..5d1bce5342 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -38,7 +38,7 @@
           <td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
         </tr>  
         <tr>
-          <td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+          <td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 7fd0881b35..424b716a0c 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -69,7 +69,7 @@
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton($lang->task->finish, '', 'btn btn-wide btn-primary');?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index 68c4c2467e..23ebab98e1 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -31,7 +31,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'>
+          <td colspan='2' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 63df990799..37484ce780 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -82,7 +82,7 @@
           <?php endfor;?>
           <?php endif;?>
           <tr>
-            <td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
+            <td colspan='6' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
           </tr>
         </tbody>
       </table>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 99ec0e44a3..7ca10c2d7d 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -66,7 +66,7 @@
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton($lang->task->start, '', 'btn btn-wide btn-primary');?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 352ce2b912..68d5969d66 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -189,7 +189,7 @@
                   if($task->needConfirm)
                   {
                       echo "(<span class='warning'>{$lang->story->changed}</span> ";
-                      echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin');
+                      echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin', "class='btn btn-mini btn-info'");
                       echo ")";
                   }
                   ?>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 59a40cc6cb..06e3ca5f75 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1333,18 +1333,7 @@ class testcaseModel extends model
                 echo "<span title='$stages'>$stages</span>";
                 break;
             case 'status':
-                if($case->needconfirm)
-                {
-                    echo "(<span class='text-warning'>{$this->lang->story->changed}</span> ";
-                    echo html::a(helper::createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin');
-                    echo ")";
-                }
-                else
-                {
-                    echo "<span class='status-{$case->status}'><span class='label label-dot'></span><span class='status-text'>";
-                    echo $this->lang->testcase->statusList[$case->status];
-                    echo '</span></span>';
-                }
+                $case->needconfirm ? print("<span class='status-changed'><span class='label label-dot'></span> {$this->lang->story->changed}</span>") : print("<span class='status-{$case->status}'><span class='label label-dot'></span><span class='status-text'>{$this->lang->testcase->statusList[$case->status]}</span></span>");
                 break;
             case 'story':
                 static $stories = array();
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 4384fd5f61..c85d61bdc2 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -113,7 +113,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'>
+          <td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index fd79320f00..1f3bb103ea 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -215,7 +215,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 38d55cfc5f..73183fc39a 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -121,7 +121,7 @@
             <div class="detail-title"><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
           </div>
-          <div class='text-center detail'>
+          <div class='text-center detail form-actions'>
             <?php echo html::hidden('lastEditedDate', $case->lastEditedDate);?>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <input type='button' value='<?php echo $lang->testcase->buttonToList;?>' class='btn btn-wide' onclick='location.href="<?php echo $isLibCase ? $this->createLink('testsuite', 'library', "libID=$libID") : $this->createLink('testcase', 'browse', "productID=$productID");?>"' />
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index ca3c8522b1..259b60b8a7 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -177,8 +177,8 @@
                 echo $lang->testcase->statusList[$case->status];
                 if($case->version > $case->currentVersion and $from == 'testtask')
                 {
-                    echo " (<span class='warning'>{$lang->testcase->changed}</span> ";
-                    echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');
+                    echo "(<span class='warning'>{$lang->testcase->changed}</span> ";
+                    echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin', "class='btn btn-mini btn-info'");
                     echo ")";
                 }
                 ?>
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index b0380427ba..ba8a06c190 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -82,7 +82,7 @@
             <td></td>
           </tr>
           <tr>
-            <td class='text-center' colspan='4'>
+            <td class='text-center form-actions' colspan='4'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index fcbd21df29..5866672101 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -82,7 +82,7 @@
             <td></td>
           </tr>
           <tr>
-            <td class='text-center' colspan='4'>
+            <td class='text-center form-actions' colspan='4'>
               <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
               <?php echo html::backButton('', '', 'btn btn-wide');?>
             </td>
diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php
index b86ed7d12b..93306ec0c1 100644
--- a/module/testsuite/view/edit.html.php
+++ b/module/testsuite/view/edit.html.php
@@ -34,7 +34,7 @@
         </tr>
         <?php endif;?>
         <tr>
-          <td class='text-center' colspan='2'>
+          <td class='text-center form-actions' colspan='2'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/testsuite/view/showimport.html.php b/module/testsuite/view/showimport.html.php
index a903b6a3f0..3dd4406c07 100644
--- a/module/testsuite/view/showimport.html.php
+++ b/module/testsuite/view/showimport.html.php
@@ -74,7 +74,7 @@
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='9' class='text-center'>
+        <td colspan='9' class='text-center form-actions'>
           <?php
           if(!$insert)
           {
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 6ca25f3d7e..2ff9764cfa 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -28,7 +28,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php
index dc4c01029d..f9a06d046a 100644
--- a/module/testtask/view/block.html.php
+++ b/module/testtask/view/block.html.php
@@ -29,7 +29,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index d1fe268d53..ba9f974c1c 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -37,7 +37,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
+          <td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 6b1ea3830d..767d5e49ee 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -80,7 +80,7 @@
           </td>
         </tr>
         <tr>
-          <td class='text-center' colspan='3'>
+          <td class='text-center form-actions' colspan='3'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index e4d1c6a5de..9121cebc28 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -81,7 +81,7 @@
       <?php $childId ++;?>
       <?php endforeach;?>
       <tr class='text-center'>
-        <td colspan='5'>
+        <td colspan='5' class='form-actions'>
           <?php
           if($preCase)  echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn'");
           echo html::submitButton('', '', 'btn btn-wide btn-primary');
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index 4404cb8092..65416acd2b 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -30,7 +30,7 @@
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
         <tr>
-          <td colspan="2" class="text-center">
+          <td colspan="2" class="text-center form-actions">
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
           </td>
diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php
index d76f61999e..98a831aa64 100755
--- a/module/todo/view/assignto.html.php
+++ b/module/todo/view/assignto.html.php
@@ -54,7 +54,7 @@
               </td>
             </tr>
             <tfoot>
-            <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
+            <tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
             </tfoot>
           </table>
         </form>
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index c7387f623b..d991b00015 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -83,7 +83,7 @@
         <?php endfor;?>
       </tbody>
       <tfoot>
-        <tr><td class='text-center' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td class='text-center form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </tfoot>
     </table>
     <div class="hidden">
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 2445748254..5cd607a68d 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -95,7 +95,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='<?php echo $columns?>' class='text-center'>
+          <td colspan='<?php echo $columns?>' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 9a5d3af69a..01c6096027 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -131,7 +131,7 @@
           </td>
         </tr>  
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
           </td>
         </tr>
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 8bc2395991..30e0eb4cff 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -110,7 +110,7 @@
               <td colspan='2' class="form-actions">
                 <?php 
                 echo html::submitButton('', '', 'btn btn-primary btn-wide');
-                echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList) : html::backButton();
+                echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');
                 echo html::hidden('parentModuleID', $currentModuleID);
                 echo html::hidden('maxOrder', $maxOrder);
                 ?>      
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 1428a09401..b3c0882903 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -101,7 +101,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="<?php echo count($visibleFields) + 6?>" class="text-center">
+          <td colspan="<?php echo count($visibleFields) + 6?>" class="text-center form-actions">
             <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 649d841759..adf901a92e 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -93,7 +93,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center">
+          <td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center form-actions">
             <?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', "btn btn-wide");?>
           </td>
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index af2ea92391..f38ad94f21 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -83,7 +83,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan='3' class='text-center'>
+          <td colspan='3' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index c5d8e32795..88317ff0f4 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -115,7 +115,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan='2' class='text-center'>
+          <td colspan='2' class='text-center form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php
index 20965a3ada..59f22c04a2 100644
--- a/module/webhook/view/create.html.php
+++ b/module/webhook/view/create.html.php
@@ -65,7 +65,7 @@
         </tr>
         <tr>
           <th></th>
-          <td>
+          <td class='form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide');?>
           </td>
diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php
index 6e94235f0f..429bf8411b 100644
--- a/module/webhook/view/edit.html.php
+++ b/module/webhook/view/edit.html.php
@@ -68,7 +68,7 @@
         </tr>
         <tr>
           <th></th>
-          <td>
+          <td class='form-actions'>
             <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
             <?php echo html::backButton('', '', 'btn btn-wide')?>
           </td>