diff --git a/module/block/control.php b/module/block/control.php
index 37398b8471..fdcedf54f7 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -656,7 +656,18 @@ class block extends control
         $num   = isset($this->params->num) ? (int)$this->params->num : 0;
         $type  = isset($this->params->type) ? $this->params->type : '';
         $pager = pager::init(0, $num , 1);
-        $this->view->productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
+
+        $productStats  = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
+        $productIdList = array();
+        foreach($productStats as $product) $productIdList[] = $product->id;
+
+        $this->view->projects = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->where('t1.product')->in($productIdList)
+            ->andWhere('t2.deleted')->eq(0)
+            ->orderBy('t1.project')
+            ->fetchPairs('product', 'name');
+        $this->view->productStats = $productStats;
     }
 
     /**
diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index 74474d859d..bd0db068a6 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -10,15 +10,18 @@
  * @link        http://www.ranzhi.org
  */
 ?>
+<?php $longBlock = $block->grid >= 6;?>
 <table class='table table-borderless table-fixed table-hover block-bug'>
   <thead>
-  <tr>
-    <th width='50'><?php echo $lang->idAB?></th>
-    <th width='50'><?php echo $lang->priAB?></th>
-    <th>           <?php echo $lang->bug->title;?></th>
-    <th width='50'><?php echo $lang->bug->severityAB?></th>
-    <th width='70'><?php echo $lang->bug->statusAB;?></th>
-  </tr>
+    <tr>
+      <?php if($longBlock):?>
+      <th width='50'><?php echo $lang->idAB?></th>
+      <?php endif;?>
+      <th width='50'><?php echo $lang->priAB?></th>
+      <th>           <?php echo $lang->bug->title;?></th>
+      <th width='50'><?php echo $lang->bug->severityAB?></th>
+      <th width='<?php echo $longBlock ? '90' : '60';?>'><?php echo $lang->bug->statusAB;?></th>
+    </tr>
   </thead>
   <?php foreach($bugs as $bug):?>
   <?php
@@ -26,11 +29,18 @@
   $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}");
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+    <?php if($longBlock):?>
     <td class='text-center'><?php echo $bug->id;?></td>
+    <?php endif;?>
     <td class='text-center'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></td>
     <td style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
     <td class='text-center'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></td>
-    <td class='text-center'><?php echo zget($lang->bug->statusList, $bug->status, $bug->status)?></td>
+    <td class='text-left' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
+      <span class="project-status-<?php echo $bug->status?>">
+        <span class="label label-dot"></span>
+        <?php if($longBlock) echo zget($lang->bug->statusList, $bug->status);?>
+      </span>
+    </td>
   </tr>
   <?php endforeach;?>
 </table>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index 38c23838c3..14277b1e01 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -10,14 +10,19 @@
  * @link        http://www.ranzhi.org
  */
 ?>
+<?php $longBlock = $block->grid >= 6;?>
 <table class='table table-borderless table-hover table-fixed block-case'>
   <thead>
   <tr>
+    <?php if($longBlock):?>
     <th width='50'><?php echo $lang->idAB?></th>
+    <?php endif;?>
     <th width='50'><?php echo $lang->priAB?></th>
     <th>           <?php echo $lang->case->title;?></th>
+    <?php if($longBlock):?>
     <th width='120'> <?php echo $lang->testtask->lastRunTime;?></th>
     <th width='60'>  <?php echo $lang->testtask->lastRunResult;?></th>
+    <?php endif;?>
     <th width='70'><?php echo $lang->statusAB;?></th> 
   </tr>
   </thead>
@@ -27,12 +32,21 @@
   $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}");
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+    <?php if($longBlock):?>
     <td class='text-center'><?php echo $case->id;?></td>
+    <?php endif;?>
     <td class='text-center'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></td>
     <td style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
+    <?php if($longBlock):?>
     <td class='text-center'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
     <td class='text-center'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-    <td class='text-center'><?php echo $lang->testcase->statusList[$case->status];?></td>
+    <?php endif;?>
+    <td class='text-left' title='<?php echo zget($lang->testcase->statusList, $case->status)?>'>
+      <span class="project-status-<?php echo $case->status?>">
+        <span class="label label-dot"></span>
+        <?php if($longBlock) echo zget($lang->testcase->statusList, $case->status);?>
+      </span>
+    </td>
   </tr>
   <?php endforeach;?>
 </table>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 0ac1f2f434..e89dd6f743 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -10,17 +10,26 @@
  * @link        http://www.zentao.net
  */
 ?>
+<?php $longBlock = $block->grid >= 6;?>
 <table class='table table-borderless table-hover table-fixed block-product'>
   <thead>
     <tr class='text-center'>
       <th class='text-left'><?php echo $lang->product->name;?></th>
-      <th width='65' title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['active'];?></th>
+      <?php if(!$longBlock):?>
       <th width='65' title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['changed'];?></th>
-      <th width='65' title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['draft'];?></th>
+      <?php endif;?>
+      <?php if($longBlock):?>
       <th width='65'><?php echo $lang->product->plans;?></th>
-      <th width='70'><?php echo $lang->product->releases;?></th>
-      <th width='95' title='<?php echo $lang->bug->common;?>'><?php echo $lang->product->bugs;?></th>
-      <th width='95' title='<?php echo $lang->bug->common;?>'><?php echo $lang->bug->unResolved;?></th>
+      <?php endif;?>
+      <th width='65'><?php echo $lang->product->releases;?></th>
+      <?php if($longBlock):?>
+      <th width='150'><?php echo $lang->product->currentProject;?></th>
+      <th width='65' title='<?php echo $lang->story->common;?>'><?php echo $lang->story->statusList['active'];?></th>
+      <?php endif;?>
+      <?php if(!$longBlock):?>
+      <th width='80' title='<?php echo $lang->bug->common;?>'><?php echo $lang->product->bugs;?></th>
+      <?php endif;?>
+      <th width='65' title='<?php echo $lang->bug->common;?>'><?php echo $lang->bug->unResolved;?></th>
     </tr>
   </thead>
   <tbody>
@@ -31,12 +40,20 @@
     ?>
     <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
       <td class='text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
-      <td><?php echo $product->stories['active']?></td>
+      <?php if(!$longBlock):?>
       <td><?php echo $product->stories['changed']?></td>
-      <td><?php echo $product->stories['draft']?></td>
+      <?php endif;?>
+      <?php if($longBlock):?>
       <td><?php echo $product->plans?></td>
+      <?php endif;?>
       <td><?php echo $product->releases?></td>
+      <?php if($longBlock):?>
+      <td class='text-left'><?php echo zget($projects, $product->id, '');?></td>
+      <td><?php echo $product->stories['active']?></td>
+      <?php endif;?>
+      <?php if(!$longBlock):?>
       <td><?php echo $product->bugs?></td>
+      <?php endif;?>
       <td><?php echo $product->unResolved?></td>
     </tr> 
     <?php endforeach;?>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index 6bc9f9a126..8c253262fb 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -10,15 +10,20 @@
  * @link        http://www.ranzhi.org
  */
 ?>
+<?php $longBlock = $block->grid >= 6;?>
 <table class='table table-borderless table-hover table-fixed block-story'>
   <thead>
   <tr>
+    <?php if($longBlock):?>
     <th width='50'><?php echo $lang->idAB?></th>
+    <?php endif;?>
     <th width='30'><?php echo $lang->priAB?></th>
     <th>           <?php echo $lang->story->title;?></th>
+    <?php if($longBlock):?>
     <th width='50'><?php echo $lang->story->estimateAB;?></th>
     <th width='70'><?php echo $lang->statusAB;?></th>
-    <th width='70'><?php echo $lang->story->stageAB;?></th>
+    <?php endif;?>
+    <th width='70' class='text-center'><?php echo $lang->story->stageAB;?></th>
   </tr>
   </thead>
   <?php foreach($stories as $story):?>
@@ -27,12 +32,21 @@
   $viewLink = $this->createLink('story', 'view', "storyID={$story->id}");
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+    <?php if($longBlock):?>
     <td class='text-center'><?php echo $story->id;?></td>
+    <?php endif;?>
     <td class='text-center'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></td>
     <td style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
+    <?php if($longBlock):?>
     <td class='text-center'><?php echo $story->estimate?></td>
-    <td class='text-center'><?php echo zget($lang->story->statusList, $story->status, $story->status);?></th>
-    <td class='text-center'><?php echo zget($lang->story->stageList, $story->stage, $story->stage);?></th>
+    <td class='text-left' title='<?php echo zget($lang->story->statusList, $story->status)?>'>
+      <span class="project-status-<?php echo $story->status?>">
+        <span class="label label-dot"></span>
+        <?php if($longBlock) echo zget($lang->story->statusList, $story->status);?>
+      </span>
+    </td>
+    <?php endif;?>
+    <td class='text-center'><?php echo zget($lang->story->stageList, $story->stage, $story->stage);?></td>
   </tr>
   <?php endforeach;?>
 </table>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 61b3e88b56..98e9741dbe 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -13,14 +13,19 @@
 <style>
 td.delayed{background: #e84e0f!important; color: white;}
 </style>
+<?php $longBlock = $block->grid >= 6;?>
 <table class='table table-borderless table-hover table-fixed block-task'>
   <thead>
   <tr>
+    <?php if($longBlock):?>
     <th width='50'><?php echo $lang->idAB?></th>
+    <?php endif;?>
     <th width='30'><?php echo $lang->priAB?></th>
     <th>           <?php echo $lang->task->name;?></th>
     <th width='50'><?php echo $lang->task->estimateAB;?></th>
+    <?php if($longBlock):?>
     <th width='75'><?php echo $lang->task->deadline;?></th>
+    <?php endif;?>
     <th width='70'><?php echo $lang->statusAB;?></th>
   </tr>
   </thead>
@@ -30,12 +35,21 @@ td.delayed{background: #e84e0f!important; color: white;}
   $viewLink = $this->createLink('task', 'view', "taskID={$task->id}");
   ?>
   <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
+    <?php if($longBlock):?>
     <td class='text-center'><?php echo $task->id;?></td>
+    <?php endif;?>
     <td class='text-center'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></td>
     <td style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
     <td class='text-center'><?php echo $task->estimate?></td>
+    <?php if($longBlock):?>
     <td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-    <td class='text-center'><?php echo zget($lang->task->statusList, $task->status, $task->status);?></th>
+    <?php endif;?>
+    <td class='text-center' title='<?php echo zget($lang->task->statusList, $task->status)?>'>
+      <span class="project-status-<?php echo $task->status?>">
+        <span class="label label-dot"></span>
+        <?php if($longBlock) echo zget($lang->task->statusList, $task->status);?>
+      </span>
+    </td>
   </tr>
   <?php endforeach;?>
 </table>
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index a9307e0581..77e950a488 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -43,6 +43,7 @@ $lang->product->doc      = 'Doc';
 $lang->product->project  = $lang->projectCommon . 'List';
 $lang->product->build    = 'Build';
 
+$lang->product->currentProject   = 'Current Project';
 $lang->product->activeStories    = 'Activated Story';
 $lang->product->changedStories   = 'Changed Story';
 $lang->product->draftStories     = 'Draft Story';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index c47a0f512c..086cea20db 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -43,6 +43,7 @@ $lang->product->doc      = '文档列表';
 $lang->product->project  = $lang->projectCommon . '列表';
 $lang->product->build    = '版本列表';
 
+$lang->product->currentProject   = '当前项目';
 $lang->product->activeStories    = '激活需求';
 $lang->product->changedStories   = '已变更需求';
 $lang->product->draftStories     = '草稿需求';