diff --git a/module/project/control.php b/module/project/control.php
index 9706947a89..b43908e4c4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -289,6 +289,14 @@ class project extends control
                 $groupTasks[$task->$groupBy][] = $task;
             }
         }
+        /* Process closed data when group by assignedTo. */
+        if($groupBy == 'assignedTo' and isset($groupTasks['Closed']))
+        {
+            $closedTasks = $groupTasks['Closed'];
+            unset($groupTasks['Closed']);
+            $groupTasks['closed'] = $closedTasks;
+        }
+
 
         /* Assign. */
         $this->app->loadLang('tree');
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 4369dbfe4b..9e839cc5f4 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -148,20 +148,13 @@ $lang->project->groups['assignedTo'] = 'By AssignedTo';
 $lang->project->groups['finishedBy'] = 'By FinishedBy';
 $lang->project->groups['closedBy']   = 'By ClosedBy';
 $lang->project->groups['type']       = 'By Type';
-$lang->project->groups['deadline']   = 'By Deadline';
 
 $lang->project->groupFilter['story']['all']         = $lang->project->all;
 $lang->project->groupFilter['story']['linked']      = 'Task Linked to Story';
 $lang->project->groupFilter['pri']['all']           = $lang->project->all;
-$lang->project->groupFilter['pri']['setted']        = 'Congfigured';
+$lang->project->groupFilter['pri']['noset']         = 'Not set';
 $lang->project->groupFilter['assignedTo']['undone'] = 'Pending';
 $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
-$lang->project->groupFilter['finishedBy']['done']   = 'Done';
-$lang->project->groupFilter['finishedBy']['all']    = $lang->project->all;
-$lang->project->groupFilter['closedBy']['closed']   = 'Closed';
-$lang->project->groupFilter['closedBy']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['setted']   = 'Configured';
 
 $lang->project->byQuery              = 'Search';
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 774c4cd7e0..399177b4dd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -148,20 +148,13 @@ $lang->project->groups['assignedTo'] = '指派给分组';
 $lang->project->groups['finishedBy'] = '完成者分组';
 $lang->project->groups['closedBy']   = '关闭者分组';
 $lang->project->groups['type']       = '类型分组';
-$lang->project->groups['deadline']   = '截止分组';
 
 $lang->project->groupFilter['story']['all']         = $lang->project->all;
 $lang->project->groupFilter['story']['linked']      = '已关联需求的任务';
 $lang->project->groupFilter['pri']['all']           = $lang->project->all;
-$lang->project->groupFilter['pri']['setted']        = '已设置';
+$lang->project->groupFilter['pri']['noset']         = '未设置';
 $lang->project->groupFilter['assignedTo']['undone'] = '未完成';
 $lang->project->groupFilter['assignedTo']['all']    = $lang->project->all;
-$lang->project->groupFilter['finishedBy']['done']   = '已完成';
-$lang->project->groupFilter['finishedBy']['all']    = $lang->project->all;
-$lang->project->groupFilter['closedBy']['closed']   = '已关闭';
-$lang->project->groupFilter['closedBy']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['all']      = $lang->project->all;
-$lang->project->groupFilter['deadline']['setted']   = '已设置';
 
 $lang->project->byQuery              = '搜索';
 
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 5faff67c96..6a5780a18f 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -25,20 +25,22 @@
 <table class='table active-disabled table-condensed table-fixed' id='groupTable'>
   <thead>
     <tr>
-      <th class='<?php echo $groupBy == 'story' ? 'w-200px' : 'w-120px'?> text-left'>
+      <th class='w-200px text-left'>
         <?php echo html::a('###', "<i class='icon-caret-down'></i> " . $lang->task->$groupBy, '', "class='expandAll' data-action='expand'")?>
         <?php echo html::a('###', "<i class='icon-caret-right'></i> " . $lang->task->$groupBy, '', "class='collapseAll hidden' data-action='collapse'")?>
       </th>
-      <th><?php echo $lang->task->name;?></th>
+      <th class='w-id'><?php echo $lang->task->id;?></th>
       <th class='w-pri'> <?php echo $lang->priAB;?></th>
+      <th><?php echo $lang->task->name;?></th>
+      <th class='w-80px'><?php echo $lang->task->status;?></th>
+      <th class='w-80px'><?php echo $lang->task->deadlineAB;?></th>
       <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
       <th class='w-user'><?php echo $lang->task->finishedBy;?></th>
       <th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
       <th class='w-50px'><?php echo $lang->task->consumedAB;?></th>
       <th class='w-50px'><?php echo $lang->task->leftAB;?></th>
+      <th class='w-50px'><?php echo $lang->task->progess;?></th>
       <th class='w-50px'><?php echo $lang->typeAB;?></th>
-      <th class='w-80px'><?php echo $lang->task->deadlineAB;?></th>
-      <th class='w-80px'><?php echo $lang->task->status;?></th>
       <th class='w-60px'><?php echo $lang->actions;?></th>
     </tr>
   </thead>
@@ -52,6 +54,10 @@
     $totalConsumed = 0.0;
     $totalLeft     = 0.0;
   ?>
+  <?php
+  if($groupBy == 'finishedBy') unset($tasks['']);
+  if($groupBy == 'closedBy') unset($tasks['']);
+  ?>
   <?php foreach($tasks as $groupKey => $groupTasks):?>
   <?php $i = 0;?>
   <?php
@@ -64,11 +70,8 @@
     $groupLeft     = 0.0;
 
     $groupName = $groupKey;
-    if($groupBy == 'story' and $groupName == 0)       $groupName = $this->lang->task->noStory;
+    if($groupBy == 'story') $groupName = empty($groupName) ? $this->lang->task->noStory : zget($groupByList, $groupKey);
     if($groupBy == 'assignedTo' and $groupName == '') $groupName = $this->lang->task->noAssigned;
-    if($groupBy == 'finishedBy' and $groupName == '') $groupName = $this->lang->task->noFinished;
-    if($groupBy == 'closedBy' and $groupName == '')   $groupName = $this->lang->task->noClosed;
-    if(!empty($groupByList[$groupKey])) $groupName .= '::' . $groupByList[$groupKey];
   ?>
   <tbody>
   <?php foreach($groupTasks as $task):?>
@@ -76,11 +79,8 @@
   if(isset($currentFilter) and $currentFilter != 'all')
   {
       if($groupBy == 'story'      and $currentFilter == 'linked' and empty($task->story)) continue;
-      if($groupBy == 'pri'        and $currentFilter == 'setted' and empty($task->pri)) continue;
+      if($groupBy == 'pri'        and $currentFilter == 'noset'  and !empty($task->pri)) continue;
       if($groupBy == 'assignedTo' and $currentFilter == 'undone' and $task->status != 'wait' and $task->status != 'doing') continue;
-      if($groupBy == 'finishedBy' and $currentFilter == 'done'   and $task->status != 'done') continue;
-      if($groupBy == 'closedBy'   and $currentFilter == 'closed' and $task->status != 'closed') continue;
-      if($groupBy == 'deadline'   and $currentFilter == 'setted' and $task->deadline == '0000-00-00') continue;
   }
   ?>
   <?php $assignedToClass = $task->assignedTo == $app->user->account ? "style='color:red'" : '';?>
@@ -121,18 +121,23 @@
       <?php if($i == 0):?>
       <td rowspan='<?php echo count($groupTasks) + 1?>' class='groupby text-left'>
         <?php echo html::a('###', "<i class='icon-caret-down'></i> " . $groupName, '', "class='expandGroup' data-action='expand' title='$groupName'");?>
+        <div class='groupSummary text' style='white-space:normal'>
+        <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
+        <?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?></div>
       </td>
       <?php endif;?>
-      <td class='text-left'>&nbsp;<?php echo $task->id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+      <td><?php echo $task->id;?></td>
       <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
+      <td class='text-left'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
+      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
       <td <?php echo $assignedToClass;?>><?php echo $task->assignedToRealName;?></td>
       <td><?php echo $users[$task->finishedBy];?></td>
       <td><?php echo $task->estimate;?></td>
       <td><?php echo $task->consumed;?></td>
       <td><?php echo $task->left;?></td>
+      <td class='text-left'><?php echo $task->progess . '%';?></td>
       <td><?php echo $lang->task->typeList[$task->type];?></td>
-      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
       <td>
         <?php common::printIcon('task', 'edit', "taskid=$task->id", '', 'list');?>
         <?php common::printIcon('task', 'delete', "projectID=$task->project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
@@ -141,31 +146,20 @@
     <?php $i++;?>
     <?php endforeach;?>
     <?php if($i != 0):?>
-    <tr class='text-center groupdivider'>
-      <td colspan='4' class='text-left'>
-        <div class='text'>
-        <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
-        <?php printf($lang->project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?></div>
-      </td>
-      <td><?php echo $groupEstimate;?></td>
-      <td><?php echo $groupConsumed;?></td>
-      <td><?php echo $groupLeft;?></td>
-      <td colspan='4'></td>
-    </tr>
     <tr class='actie-disabled group-collapse hidden text-center group-title'>
-      <td colspan='5' class='text-left'>
+      <td class='text-left'>
         <?php echo html::a('###', "<i class='icon-caret-right'></i> " . $groupName, '', "class='collapseGroup' data-action='collapse' title='$groupName'");?>
+      </td>
+      <td></td>
+      <td></td>
+      <td colspan='11' class='text-left'>
         <span class='groupdivider' style='margin-left:10px;'>
           <span class='text'>
             <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
-            <?php printf($lang->project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?>
+            <?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
           </span>
         </span>
       </td>
-      <td><?php echo $groupEstimate;?></td>
-      <td><?php echo $groupConsumed;?></td>
-      <td><?php echo $groupLeft;?></td>
-      <td colspan='4'></td>
     </tr>
     <?php endif;?>
   </tbody>
diff --git a/module/task/model.php b/module/task/model.php
index 23580744ad..aad2740964 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1191,6 +1191,9 @@ class taskModel extends model
             $task->productType = $product->type;
         }
 
+        /* Set closed realname. */
+        if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed';
+
         /* Compute task progess. */
         if($task->consumed == 0 and $task->left == 0)
         {