diff --git a/public/templates/bootstrap/account/notifications/default.tpl b/public/templates/bootstrap/account/notifications/default.tpl
index d64d5952..5b04b590 100755
--- a/public/templates/bootstrap/account/notifications/default.tpl
+++ b/public/templates/bootstrap/account/notifications/default.tpl
@@ -1,15 +1,14 @@
 <div class="row">
-  <div class="col-lg-4">
+  <form class="col-lg-4" method="POST" role="form">
+    <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+    <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:""}">
     <div class="panel panel-info">
       <div class="panel-heading">
         <i class="fa fa-gear fa-fw"></i> Notification Settings
       </div>
       <div class="panel-body no-padding">
-        <form action="{$smarty.server.SCRIPT_NAME}" method="POST" role="form">
-          <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-          <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 table-striped table-bordered table-hover">
             <tr>
               <td>
@@ -53,9 +52,8 @@
           </div>
           <div class="panel-footer">
           <input type="submit" value="Update" class="btn btn-success">
-        </form>
       </div>
-    </div>
+    </form>
   </div>
 
   <div class="col-lg-8">
diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl
index 8066930a..9173f4c5 100755
--- a/public/templates/bootstrap/account/transactions/default.tpl
+++ b/public/templates/bootstrap/account/transactions/default.tpl
@@ -31,15 +31,14 @@
 {/if}
 
 <div class="row">
-  <div class="col-lg-4">
+  <form class="col-lg-4" role="form">
+    <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+    <input type="hidden" name="action" value="{$smarty.request.action|escape}">
     <div class="panel panel-info">
       <div class="panel-heading">
         <i class="fa fa-search fa-fw"></i> Transaction Filter
       </div>
       <div class="panel-body">
-        <form action="{$smarty.server.SCRIPT_NAME}" role="form">
-          <input type="hidden" name="page" value="{$smarty.request.page|escape}" />
-          <input type="hidden" name="action" value="{$smarty.request.action|escape}" />
             <ul class="pager">
               <li class="previous {if $smarty.get.start <= 0}disabled{/if}">
                 <a href="{if $smarty.get.start|default:"0" <= 0}#{else}{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&start={$smarty.request.start|escape|default:"0" - $LIMIT}{if $FILTERS|default:""}{$FILTERS}{/if}{/if}">&larr; Prev</a>
@@ -56,11 +55,12 @@
               <label>Status</label>
               {html_options class="form-control" name="filter[status]" options=$TXSTATUS selected=$smarty.request.filter.status|default:""}
             </div>
-            <input type="submit" value="Filter" class="btn btn-outline btn-success btn-lg btn-block">
-        </form>
+      </div>
+      <div class="panel-footer">
+        <input type="submit" value="Filter" class="btn btn-success">
       </div>
     </div>
-  </div>
+  </form>
       
   <div class="col-lg-8">
     <div class="panel panel-info">
diff --git a/public/templates/bootstrap/account/workers/default.tpl b/public/templates/bootstrap/account/workers/default.tpl
index 5b5f9826..b22c532b 100755
--- a/public/templates/bootstrap/account/workers/default.tpl
+++ b/public/templates/bootstrap/account/workers/default.tpl
@@ -1,14 +1,13 @@
 <div class="row">
-  <form class="col-lg-3" action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
+  <form class="col-lg-3" method="POST" role="form">
+    <input type="hidden" name="page" value="{$smarty.request.page|escape}">
+    <input type="hidden" name="action" value="{$smarty.request.action|escape}">
+    <input type="hidden" name="do" value="add">
+    <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}">
     <div class="panel panel-info">
       <div class="panel-heading">
         <i class="fa fa-plus-square-o fa-fw"></i> Add New Worker
       </div>
-      <div class="panel-body">
-        <input type="hidden" name="page" value="{$smarty.request.page|escape}">
-        <input type="hidden" name="action" value="{$smarty.request.action|escape}">
-        <input type="hidden" name="do" value="add">
-        <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
         <div class="panel-body">
           <div class="form-group">
             <label>Worker Name</label>
@@ -19,7 +18,6 @@
             <input class="form-control" type="text" name="password" value="password" size="10" maxlength="20" required>
           </div>
         </div>
-      </div>
       <div class="panel-footer">
         <input type="submit" value="Add New Worker" class="btn btn-success">
       </div>
@@ -38,7 +36,7 @@
         <input type="hidden" name="ctoken" value="{$CTOKEN|escape|default:""}" />
         <div class="panel-body no-padding">
           <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
+          <table class="table">
              <thead>
                 <tr>
                   <th>Worker Login</th>