diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php
index ed7a0dabd7..d2439aa95a 100644
--- a/module/bug/view/linkbugs.html.php
+++ b/module/bug/view/linkbugs.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2>
@@ -22,7 +23,7 @@
   <div id='queryBox' class='show divider'></div>
   <?php if($bugs2Link):?>
   <form class='main-table' method='post' data-ride='table' target='hiddenwin' id='linkBugsForm'>
-    <table class='table' id='bugList'>
+    <table class='table tablesorter' id='bugList'>
       <thead>
         <tr>
           <th class="c-id">
diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 0d055101e1..33677b5ec9 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -10,13 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' class='show'></div>
 <div id='unlinkBugList'>
   <form class='main-table table-bug' data-ride='table' method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkBug', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?>  <?php echo $lang->productplan->unlinkedBugs;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'> 
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -71,4 +71,7 @@
     </div>
     <?php endif;?>
   </form>
-</div>
\ No newline at end of file
+</div>
+<script>
+$(function(){$('#unlinkBugList .tablesorter').sortTable();});
+</script>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 27c1bac6e9..5fc2fdfd23 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -10,13 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' class='show'></div>
 <div id='unlinkStoryList'>
   <form class='main-table table-story' data-ride='table' method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('build', 'linkStory', "buildID={$build->id}&browseType=$browseType&param=$param");?>'>
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'> 
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -76,3 +76,6 @@
     <?php endif;?>
   </form>
 </div>
+<script>
+$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
+</script>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index aae3f5b5f4..cd456490c9 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->build->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->build->confirmUnlinkBug)?>
 <?php js::set('flow', $config->global->flow)?>
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 4a52b36aa9..3381a10f34 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -16,7 +16,7 @@
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'>
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -71,3 +71,6 @@
     </div>
   </form>
 </div>
+<script>
+$(function(){$('#unlinkBugList .tablesorter').sortTable();});
+</script>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index db199e2995..2efb220ace 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -16,7 +16,7 @@
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'>
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -79,3 +79,6 @@
     </div>
   </form>
 </div>
+<script>
+$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
+</script>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index cc401bdff8..20cdad30d9 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/sortable.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->productplan->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->productplan->confirmUnlinkBug)?>
 <?php js::set('planID', $plan->id);?>
diff --git a/module/project/js/story.js b/module/project/js/story.js
index 75bac77fec..cea313b85c 100644
--- a/module/project/js/story.js
+++ b/module/project/js/story.js
@@ -28,6 +28,7 @@ $(function()
             parent.location.href = createLink('project', 'importPlanStories', 'projectID=' + projectID + '&planID=' + planID);
         }
     })
+    $('.sorter-false a').unwrap();
 });
 
 function showCheckedSummary()
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index 147b5eb036..caf5cd0058 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <style>
 .search-form .form-actions {padding-bottom: 10px!important;}
 </style>
@@ -27,7 +28,7 @@
     <div id='queryBox' class='show no-margin'></div>
   </div>
   <form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
-    <table class='table table-fixed' id='linkStoryList'> 
+    <table class='table table-fixed tablesorter' id='linkStoryList'> 
       <thead>
         <tr>
           <th class='c-id'>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 729666b109..2790f044eb 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php $canOrder = common::hasPriv('project', 'storySort');?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <?php if($canOrder) include '../../common/view/sortable.html.php';?>
 <?php js::set('moduleID', ($type == 'byModule' ? $param : 0));?>
 <?php js::set('productID', ($type == 'byProduct' ? $param : 0));?>
@@ -97,7 +98,7 @@
       <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
-      <table class='table has-sort-head' id='storyList'>
+      <table class='table tablesorter has-sort-head' id='storyList'>
         <thead>
           <tr>
           <?php
@@ -106,7 +107,7 @@
           $canBatchClose = common::hasPriv('story', 'batchClose');
           ?>
           <?php $vars = "projectID={$project->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-            <th class='c-id'>
+            <th class='c-id {sorter:false}'>
               <?php if($canBatchEdit or $canBatchClose):?>
               <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
                 <label></label>
@@ -115,19 +116,19 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <?php if($canOrder):?>
-            <th class='w-80px c-sort'> <?php common::printOrderLink('order',      $orderBy, $vars, $lang->project->updateOrder);?></th>
+            <th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order',      $orderBy, $vars, $lang->project->updateOrder);?></th>
             <?php endif;?>
-            <th class='c-pri'>  <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-            <th class='c-name'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-            <th class='c-user'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-            <th class='c-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-            <th class='c-estimate w-80px'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-            <th class='c-status'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-stage w-70px'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
+            <th class='c-pri {sorter:false}'>  <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-name {sorter:false}'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
+            <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+            <th class='c-user {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+            <th class='c-estimate w-80px {sorter:false}'> <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+            <th class='c-status {sorter:false}'> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+            <th class='c-stage w-70px {sorter:false}'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
             <th title='<?php echo $lang->story->taskCount?>' class='w-30px'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='w-30px'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='w-30px'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
+            <th class='c-actions-4 text-center {sorter:false}'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody id='storyTableList' class='sortable'>
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index d2b3b07e13..dcf28182d8 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' class='show'></div>
 <?php
 $releaseBugs = $type == 'bug' ? $release->bugs : $release->leftBugs;
 $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
@@ -20,7 +20,7 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedBugs;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'> 
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -75,3 +75,6 @@ $formID      = $type == 'leftBug' ? 'unlinkedLeftBugsForm' : 'unlinkedBugsForm';
     </div>
   </form>
 </div>
+<script>
+$(function(){$('#<?php echo $formID;?> .tablesorter').sortTable();});
+</script>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index a0b58d99cd..80ec3ef12b 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -10,13 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
-<div id='queryBox' class='show no-margin'></div>
+<div id='queryBox' class='show'></div>
 <div id='unlinkStoryList'>
   <form class='main-table' method='post' target='hiddenwin' id='unlinkedStoriesForm' action='<?php echo $this->createLink('release', 'linkStory', "releaseID=$release->id&browseType=$browseType&param=$param")?>' data-ride='table'>
     <div class='table-header hl-primary text-primary strong'>
       <?php echo html::icon('unlink');?> <?php echo $lang->productplan->unlinkedStories;?>
     </div>
-    <table class='table'>
+    <table class='table tablesorter'> 
       <thead>
         <tr class='text-center'>
           <th class='c-id text-left'>
@@ -44,7 +44,7 @@
         <tr>
           <td class='c-id text-left'>
             <div class="checkbox-primary">
-              <input type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> />
+              <input type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' <?php if($story->stage == 'developed' or $story->status == 'closed') echo 'checked';?> /> 
               <label></label>
             </div>
             <?php printf('%03d', $story->id);?>
@@ -74,4 +74,7 @@
       <div class='table-statistic'></div>
     </div>
   </form>
-</div>
\ No newline at end of file
+</div>
+<script>
+$(function(){$('#unlinkStoryList .tablesorter').sortTable();});
+</script>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index a516c9e0f9..5d2e6433d2 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->release->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->release->confirmUnlinkBug)?>
 <div id='mainMenu' class='clearfix'>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 2e0ba133e9..55e4c50009 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -26,7 +26,7 @@
           <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
           <td>
             <div class="input-group w-p35-f">
-              <?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="form-control chosen"');?>
+              <?php echo html::select('assignedTo', $users, $story->reviewedBy, 'class="form-control chosen"');?>
               <?php if(!$this->story->checkForceReview()):?>
               <span class="input-group-addon">
               <?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?>
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index 372fdbc411..e2d2be67ae 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <?php js::set('linkType', $type);?>
 <div class='main-content' id='mainContent'>
   <div class='main-header'>
@@ -25,7 +26,7 @@
   <div id='queryBox' class='show divider'></div>
   <form method='post' target='hiddenwin' id='linkStoryForm' class='main-table table-story'>
     <?php if($stories2Link):?>
-    <table class='table' id='storyList'>
+    <table class='table tablesorter' id='storyList'>
       <thead>
       <tr>
         <th class='c-id'>
diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php
index 3687fc01fd..d8d2ff8073 100644
--- a/module/testcase/view/linkcases.html.php
+++ b/module/testcase/view/linkcases.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div id="mainContent" class="main-content">
   <div class='main-header'>
     <h2>
@@ -22,7 +23,7 @@
   <div id='queryBox' class='show divider'></div>
   <?php if($cases2Link):?>
   <form class='main-table' method='post' target='hiddenwin' id='linkCasesForm' data-ride='table'>
-    <table class='table' id='caseList'>
+    <table class='table tablesorter' id='caseList'>
       <thead>
         <tr>
           <th class='c-id'>
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index ce296f60af..70eab0c1cd 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -30,7 +30,7 @@
     <div class="table-header">
       <i class="icon-unlink"></i> &nbsp;<strong><?php echo $lang->testsuite->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
     </div>
-    <table class='table' id='testcaseList'>
+    <table class='table tablesorter' id='testcaseList'>
       <thead>
         <tr>
           <th class='w-id'>
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index c028ce195c..aae5e77e5e 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/tablesorter.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php common::printBack($this->session->testtaskList, 'btn btn-link');?>
@@ -68,7 +69,7 @@
 <div class="cell show" id="queryBox"></div>
 <div id='mainContent'>
   <form class='main-table table-case' data-ride='table' method='post'>
-    <table class='table'>
+    <table class='table tablesorter'>
       <div class="table-header">
         <i class="icon-unlink"></i> &nbsp;<strong><?php echo $lang->testtask->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
       </div>