diff --git a/module/common/view/tablesorter.html.php b/module/common/view/tablesorter.html.php
index a7fcbf2c65..a03f7e7213 100755
--- a/module/common/view/tablesorter.html.php
+++ b/module/common/view/tablesorter.html.php
@@ -3,26 +3,32 @@
 js::import($jsRoot . 'jquery/tablesorter/min.js');
 js::import($jsRoot . 'jquery/tablesorter/metadata.js');
 ?>
+<style>
+table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerUnSorted .tablesorter-header-inner:after{font-family: ZenIcon; font-weight: normal; content: " \e6bd"; font-size: 14px;}
+table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{font-family: ZenIcon; font-weight: normal; content: " \e6b9"; font-size: 14px; color: #03C;}
+table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZenIcon; font-weight: normal; content: " \e6b8"; font-size: 14px; color: #03C;}
+table.tablesorter tr.tablesorter-headerRow .header.sorter-false .tablesorter-header-inner:after{content:"";}
+</style>
 <script language='javascript'>
 
 /* sort table after page load. */
-$(function() { sortTable(); } );
+$(function(){sortTable('.tablesorter');});
 
-function sortTable()
+function sortTable(obj)
 {
-    $('.tablesorter').tablesorter(
+    $(obj).tablesorter(
     {
         saveSort: true,
         widgets: ['zebra', 'saveSort'], 
         widgetZebra: {css: ['odd', 'even'] }
     });
 
-    $('.tablesorter tbody tr').hover(
+    $(obj + ' tbody tr').hover(
         function(){$(this).addClass('hoover')},
         function(){$(this).removeClass('hoover')}
     );
 
-    $('.tablesorter tbody tr').click(
+    $(obj + ' tbody tr').click(
         function()
         {
             if($(this).attr('class').indexOf('clicked') > 0)
diff --git a/module/extension/view/header.html.php b/module/extension/view/header.html.php
index b0cd853445..8863036fa7 100644
--- a/module/extension/view/header.html.php
+++ b/module/extension/view/header.html.php
@@ -1,5 +1,4 @@
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
 <div id='featurebar'>
   <ul class='nav'>
     <?php 
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 0d4850ec0b..728b4f99af 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -10,6 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php
+$jsRoot = $this->app->getWebRoot() . "js/";
+include '../../common/view/tablesorter.html.php';
+?>
 <div id='querybox' class='show'></div>
 <div id='unlinkBugList'>
   <form method='post' id='unlinkedBugsForm' target='hiddenwin' action='<?php echo $this->createLink('productplan', 'linkBug', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>'>
@@ -60,4 +64,10 @@
     </table>
   </form>
 </div>
-<script>$(function(){ajaxGetSearchForm('#bugs .linkBox #querybox')})</script>
+<script>
+$(function()
+{
+    ajaxGetSearchForm('#bugs .linkBox #querybox');
+    sortTable('#unlinkedBugsForm .tablesorter');
+})
+</script>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index e174abf8ff..d49b1fb01f 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -10,6 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php
+$jsRoot = $this->app->getWebRoot() . "js/";
+include '../../common/view/tablesorter.html.php';
+?>
 <div id='querybox' class='show'></div>
 <div id='unlinkStoryList'>
   <form method='post' id='unlinkedStoriesForm' target='hiddenwin' action='<?php echo $this->createLink('productplan', 'linkStory', "planID=$plan->id&browseType=$browseType&param=$param&orderBy=$orderBy")?>'>
@@ -63,4 +67,10 @@
     </table>
   </form>
 </div>
-<script>$(function(){ajaxGetSearchForm('#stories .linkBox #querybox')})</script>
+<script>
+$(function()
+{
+    ajaxGetSearchForm('#stories .linkBox #querybox');
+    sortTable('#unlinkedStoriesForm .tablesorter');
+});
+</script>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 7ed7ff54be..f5ce083d49 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -62,15 +62,15 @@
                 <?php $vars = "planID={$plan->id}&type=story&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
                 <tr>
-                  <th class='w-id' >   <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-                  <th class='w-pri'>   <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-                  <th>                 <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-                  <th class='w-user'>  <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                  <th class='w-user'>  <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-                  <th class='w-60px'>  <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-                  <th class='w-status'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-                  <th class='w-80px'>  <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-                  <th class='w-50px'><?php echo $lang->actions?></th>
+                  <th class='w-id {sorter:false}' >   <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
+                  <th class='w-pri {sorter:false}'>   <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                  <th class='{sorter:false}'>         <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
+                  <th class='w-user {sorter:false}'>  <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                  <th class='w-user {sorter:false}'>  <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+                  <th class='w-60px {sorter:false}'>  <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+                  <th class='w-status {sorter:false}'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+                  <th class='w-80px {sorter:false}'>  <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
+                  <th class='w-50px {sorter:false}'>  <?php echo $lang->actions?></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -138,13 +138,13 @@
                 <?php $vars = "planID={$plan->id}&type=bug&orderBy=%s&link=$link&param=$param"; ?>
                 <thead>
                 <tr>
-                  <th class='w-id'>    <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-                  <th class='w-pri'>   <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-                  <th>                 <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
-                  <th class='w-user'>  <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-                  <th class='w-user'>  <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-                  <th class='w-status'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-                  <th class='w-50px'><?php echo $lang->actions?></th>
+                  <th class='w-id {sorter:false}'>    <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
+                  <th class='w-pri {sorter:false}'>   <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+                  <th class='{sorter:false}'>         <?php common::printOrderLink('title',      $orderBy, $vars, $lang->bug->title);?></th>
+                  <th class='w-user {sorter:false}'>  <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+                  <th class='w-user {sorter:false}'>  <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+                  <th class='w-status {sorter:false}'><?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+                  <th class='w-50px {sorter:false}'>  <?php echo $lang->actions?></th>
                 </tr>
                 </thead>
                 <tbody>
diff --git a/module/user/model.php b/module/user/model.php
index 0bafb1f177..c36452464a 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -639,7 +639,7 @@ class userModel extends model
                     break;
                 }
                 $acl = json_decode($group->acl, true);
-                if(empty($acls))
+                if(empty($acls) and !empty($acl))
                 {
                     $acls = $acl;
                     continue;
@@ -648,7 +648,7 @@ class userModel extends model
                 if(empty($acl['products'])) $productAllow = true;
                 if(empty($acl['projects'])) $projectAllow = true;
 
-                $acls['views'] = array_merge($acls['views'], $acl['views']);
+                if(!empty($acl['views'])) $acls['views'] = array_merge($acls['views'], $acl['views']);
                 if(!empty($acl['products'])) $acls['products'] = !empty($acls['products']) ? array_merge($acls['products'], $acl['products']) : $acl['products'];
                 if(!empty($acl['projects'])) $acls['projects'] = !empty($acls['projects']) ? array_merge($acls['projects'], $acl['projects']) : $acl['projects'];
             }