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/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/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/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>