diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index aa8b7cbd96..85a8bc497e 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -103,124 +103,125 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
     $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
     include $file2Include;
     ?>
-    <tfoot>
-      <tr>
-        <?php
-        $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 10;
-        if($browseType == 'needconfirm') $columns = 7;
-        ?>
-        <td colspan='<?php echo $columns;?>'>
-          <?php if(!empty($bugs)):?>
-          <div class='table-actions clearfix'>
-            <?php if(!$useDatatable) echo html::selectButton();?>
-            <div class='btn-group dropup'>
-              <?php
-              $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID&branch=$branch");
-              $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
-              echo html::commonButton($lang->edit, $misc);
-              ?>
-              <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
-              <ul class='dropdown-menu'>
+      <tfoot>
+        <tr>
+          <?php
+          $columns = $this->cookie->windowWidth >= $this->config->wideSize ? 12 : 10;
+          if($browseType == 'needconfirm') $columns = 7;
+          ?>
+          <td colspan='<?php echo $columns;?>'>
+            <?php if(!empty($bugs)):?>
+            <div class='table-actions clearfix'>
+              <?php if(!$useDatatable) echo html::selectButton();?>
+              <div class='btn-group dropup'>
                 <?php
-                $class = "class='disabled'";
-                $actionLink = $this->createLink('bug', 'batchConfirm');
-                $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class;
-                if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "</li>";
-
-                $actionLink = $this->createLink('bug', 'batchClose');
-                $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class;
-                if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->close, '', $misc) . "</li>";
-
-                if(common::hasPriv('bug', 'batchChangeModule'))
-                {
-                    $withSearch = count($modules) > 8;
-                    echo "<li class='dropdown-submenu'>";
-                    echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                    foreach($modules as $moduleId => $module)
-                    {
-                        $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
-                        echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
-                    }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
-                }
-                else
-                {
-                    echo '<li>' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '</li>';
-                }
-
-                $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : '';
-                if($misc)
-                {
-                    echo "<li class='dropdown-submenu'>" . html::a('javascript:;', $lang->bug->resolve,  '', $misc);
-                    echo "<ul class='dropdown-menu'>";
-                    unset($lang->bug->resolutionList['']);
-                    unset($lang->bug->resolutionList['duplicate']);
-                    unset($lang->bug->resolutionList['tostory']);
-                    foreach($lang->bug->resolutionList as $key => $resolution)
-                    {
-                        $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key");
-                        if($key == 'fixed')
-                        {
-                            $withSearch = count($builds) > 4;
-                            echo "<li class='dropdown-submenu'>";
-                            echo html::a('javascript:;', $resolution, '', "id='fixedItem'");
-                            echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                            unset($builds['']);
-                            foreach($builds as $key => $build)
-                            {
-                                $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
-                                echo "<li class='option' data-key='$key'>";
-                                echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
-                                echo "</li>";
-                            }
-                            if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                            echo '</ul></li>';
-                        }
-                        else
-                        {
-                            echo '<li>' . html::a('javascript:;', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . '</li>';
-                        }
-                    }
-                    echo '</ul></li>';
-                }
-                else
-                {
-                    echo "<li>" . html::a('javascript:;', $lang->bug->resolve,  '', $class);
-                }
-
-                $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');
-                if($canBatchAssignTo && count($bugs))
-                {
-                    $withSearch = count($memberPairs) > 10;
-                    $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product");
-                    echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
-                    echo "<li class='dropdown-submenu'>";
-                    echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"');
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
-                    foreach ($memberPairs as $key => $value)
-                    {
-                        if(empty($key)) continue;
-                        echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
-                    }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo "</ul>";
-                    echo "</li>";
-                }
-                else
-                {
-                    echo "<li>" . html::a('javascript:;', $lang->bug->assignedTo,  '', $class);
-                }
+                $actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID&branch=$branch");
+                $misc       = common::hasPriv('bug', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+                echo html::commonButton($lang->edit, $misc);
                 ?>
-              </ul>
+                <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+                <ul class='dropdown-menu'>
+                  <?php
+                  $class = "class='disabled'";
+                  $actionLink = $this->createLink('bug', 'batchConfirm');
+                  $misc = common::hasPriv('bug', 'batchConfirm') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class;
+                  if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "</li>";
+
+                  $actionLink = $this->createLink('bug', 'batchClose');
+                  $misc = common::hasPriv('bug', 'batchClose') ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : $class;
+                  if($misc) echo "<li>" . html::a('javascript:;', $lang->bug->close, '', $misc) . "</li>";
+
+                  if(common::hasPriv('bug', 'batchChangeModule'))
+                  {
+                      $withSearch = count($modules) > 8;
+                      echo "<li class='dropdown-submenu'>";
+                      echo html::a('javascript:;', $lang->bug->moduleAB, '', "id='moduleItem'");
+                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      foreach($modules as $moduleId => $module)
+                      {
+                          $actionLink = $this->createLink('bug', 'batchChangeModule', "moduleID=$moduleId");
+                          echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
+                      }
+                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
+                      echo '</ul></li>';
+                  }
+                  else
+                  {
+                      echo '<li>' . html::a('javascript:;', $lang->bug->moduleAB, '', $class) . '</li>';
+                  }
+
+                  $misc = common::hasPriv('bug', 'batchResolve') ? "id='resolveItem'" : '';
+                  if($misc)
+                  {
+                      echo "<li class='dropdown-submenu'>" . html::a('javascript:;', $lang->bug->resolve,  '', $misc);
+                      echo "<ul class='dropdown-menu'>";
+                      unset($lang->bug->resolutionList['']);
+                      unset($lang->bug->resolutionList['duplicate']);
+                      unset($lang->bug->resolutionList['tostory']);
+                      foreach($lang->bug->resolutionList as $key => $resolution)
+                      {
+                          $actionLink = $this->createLink('bug', 'batchResolve', "resolution=$key");
+                          if($key == 'fixed')
+                          {
+                              $withSearch = count($builds) > 4;
+                              echo "<li class='dropdown-submenu'>";
+                              echo html::a('javascript:;', $resolution, '', "id='fixedItem'");
+                              echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                              unset($builds['']);
+                              foreach($builds as $key => $build)
+                              {
+                                  $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
+                                  echo "<li class='option' data-key='$key'>";
+                                  echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"");
+                                  echo "</li>";
+                              }
+                              if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
+                              echo '</ul></li>';
+                          }
+                          else
+                          {
+                              echo '<li>' . html::a('javascript:;', $resolution, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . '</li>';
+                          }
+                      }
+                      echo '</ul></li>';
+                  }
+                  else
+                  {
+                      echo "<li>" . html::a('javascript:;', $lang->bug->resolve,  '', $class);
+                  }
+
+                  $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');
+                  if($canBatchAssignTo && count($bugs))
+                  {
+                      $withSearch = count($memberPairs) > 10;
+                      $actionLink = $this->createLink('bug', 'batchAssignTo', "productID={$productID}&type=product");
+                      echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
+                      echo "<li class='dropdown-submenu'>";
+                      echo html::a('javascript::', $lang->bug->assignedTo, 'id="assignItem"');
+                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search':'') . "'>";
+                      foreach ($memberPairs as $key => $value)
+                      {
+                          if(empty($key)) continue;
+                          echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
+                      }
+                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
+                      echo "</ul>";
+                      echo "</li>";
+                  }
+                  else
+                  {
+                      echo "<li>" . html::a('javascript:;', $lang->bug->assignedTo,  '', $class);
+                  }
+                  ?>
+                </ul>
+              </div>
             </div>
-          </div>
-          <?php endif;?>
-          <div class='text-right'><?php $pager->show();?></div>
-        </td>
-      </tr>
-    </tfoot>
+            <?php endif;?>
+            <div class='text-right'><?php $pager->show();?></div>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
   </form>
 </div>
 <script>
diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php
index a8a6e1fa67..e105643907 100644
--- a/module/common/view/datatable.html.php
+++ b/module/common/view/datatable.html.php
@@ -89,9 +89,7 @@ $(document).ready(function()
     };
     setTimeout(function(){fixScroll()}, 500);
 });
-</script>
-<?php endif;?>
-<script>
+
 /**
  * Fix scroll bar.
  * 
@@ -125,3 +123,4 @@ function fixScroll()
     });
 }
 </script>
+<?php endif;?>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index fb57c41396..6c29a6c977 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1016,7 +1016,7 @@ class testcaseModel extends model
                 if(common::hasPriv('testcase', 'delete'))
                 {
                     $deleteURL = helper::createLink('testcase', 'delete', "caseID=$case->id&confirm=yes");
-                    echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '<i class="icon-remove"></i>', '', "title='{$this->lang->testcase->delete}' class='btn-icon'");
+                    echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"batchForm\",confirmDelete)", '<i class="icon-remove"></i>', '', "title='{$this->lang->testcase->delete}' class='btn-icon'");
                 }
 
                 common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe');
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 8f212cf6e1..258bbe3306 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -44,59 +44,60 @@ js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
     $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
     include $file2Include;
     ?>
-    <tfoot>
-      <tr>
-        <?php $mergeColums = $browseType == 'needconfirm' ? 5 : 10;?>
-        <td colspan='<?php echo $mergeColums?>'>
-          <?php if($cases):?>
-          <div class='table-actions clearfix'>
-            <?php echo html::selectButton();?>
-            <div class='btn-group dropup'>
-              <?php
-              $class = "class='disabled'";
+      <tfoot>
+        <tr>
+          <?php $mergeColums = $browseType == 'needconfirm' ? 5 : 10;?>
+          <td colspan='<?php echo $mergeColums?>'>
+            <?php if($cases):?>
+            <div class='table-actions clearfix'>
+              <?php echo html::selectButton();?>
+              <div class='btn-group dropup'>
+                <?php
+                $class = "class='disabled'";
 
-              $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch");
-              $misc       = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
-              echo html::commonButton($lang->edit, $misc);
-              ?>
-              <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
-              <ul class='dropdown-menu' id='moreActionMenu'>
-                <?php 
-                $actionLink = $this->createLink('testcase', 'batchDelete', "productID=$productID");
-                $misc = common::hasPriv('testcase', 'batchDelete') ? "onclick=\"confirmBatchDelete('$actionLink')\"" : $class;
-                echo "<li>" . html::a('#', $lang->delete, '', $misc) . "</li>";
-
-                $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
-                $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
-                echo "<li>" . html::a('#', $lang->testtask->runCase, '', $misc) . "</li>";
-
-                if(common::hasPriv('testcase', 'batchChangeModule'))
-                {
-                    $withSearch = count($modules) > 8;
-                    echo "<li class='dropdown-submenu'>";
-                    echo html::a('javascript:;', $lang->testcase->moduleAB, '', "id='moduleItem'");
-                    echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search' : '') . "'>";
-                    foreach($modules as $moduleId => $module)
-                    {
-                        $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId");
-                        echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
-                    }
-                    if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
-                    echo '</ul></li>';
-                }
-                else
-                {
-                    echo '<li>' . html::a('javascript:;', $lang->testcase->moduleAB, '', $class) . '</li>';
-                }
+                $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch");
+                $misc       = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+                echo html::commonButton($lang->edit, $misc);
                 ?>
-              </ul>
+                <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+                <ul class='dropdown-menu' id='moreActionMenu'>
+                  <?php 
+                  $actionLink = $this->createLink('testcase', 'batchDelete', "productID=$productID");
+                  $misc = common::hasPriv('testcase', 'batchDelete') ? "onclick=\"confirmBatchDelete('$actionLink')\"" : $class;
+                  echo "<li>" . html::a('#', $lang->delete, '', $misc) . "</li>";
+
+                  $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
+                  $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : $class;
+                  echo "<li>" . html::a('#', $lang->testtask->runCase, '', $misc) . "</li>";
+
+                  if(common::hasPriv('testcase', 'batchChangeModule'))
+                  {
+                      $withSearch = count($modules) > 8;
+                      echo "<li class='dropdown-submenu'>";
+                      echo html::a('javascript:;', $lang->testcase->moduleAB, '', "id='moduleItem'");
+                      echo "<ul class='dropdown-menu" . ($withSearch ? ' with-search' : '') . "'>";
+                      foreach($modules as $moduleId => $module)
+                      {
+                          $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId");
+                          echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
+                      }
+                      if($withSearch) echo "<li class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
+                      echo '</ul></li>';
+                  }
+                  else
+                  {
+                      echo '<li>' . html::a('javascript:;', $lang->testcase->moduleAB, '', $class) . '</li>';
+                  }
+                  ?>
+                </ul>
+              </div>
             </div>
-          </div>
-          <?php endif?>
-          <div class='text-right'><?php $pager->show();?></div>
-        </td>
-      </tr>
-    </tfoot>
+            <?php endif?>
+            <div class='text-right'><?php $pager->show();?></div>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
   </form>
 </div>
 <script>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 74864b065a..a9ffb157f6 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -710,7 +710,7 @@ class testtaskModel extends model
                 if(common::hasPriv('testtask', 'unlinkCase'))
                 {
                     $unlinkURL = helper::createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
-                    echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn-icon'");
+                    echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"casesForm\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn-icon'");
                 }
 
                 common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe');
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 579a4638c9..b9831ef315 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -928,15 +928,12 @@ function ajaxDelete(url, replaceID, notice)
             {
                 if(data.result == 'success') 
                 {
-                    $('#' + replaceID).wrap("<div id='tmpDiv'></div>");
-                    $('#tmpDiv').load(document.location.href + ' #' + replaceID, function()
+                    $.get(document.location.href, function(data)
                     {
-                        $('#tmpDiv').replaceWith($('#tmpDiv').html());
-                        if(typeof sortTable == 'function')
-                        {
-                            sortTable(); 
-                        }
+                        $('#' + replaceID).html($(data).find('#' + replaceID).html());
+                        if(typeof sortTable == 'function') sortTable(); 
                         $('#' + replaceID).find('[data-toggle=modal], a.iframe').modalTrigger();
+                        $('#' + replaceID).find('table.datatable').datatable();
                     });
                 }
             }