diff --git a/trunk/module/bug/view/view.html.php b/trunk/module/bug/view/view.html.php
index 1aeefa94e4..e0cfe6db5e 100644
--- a/trunk/module/bug/view/view.html.php
+++ b/trunk/module/bug/view/view.html.php
@@ -69,7 +69,7 @@
       <legend><?php echo $lang->bug->legendBasicInfo;?></legend>
       <table class='table-1 a-left'>
         <tr valign='middle'>
-          <th class='w-p25 rowhead'><?php echo $lang->bug->lblProductAndModule;?></th>
+          <th class='w-p20 rowhead'><?php echo $lang->bug->lblProductAndModule;?></th>
           <td>
             <?php
             if(!common::printLink('bug', 'browse', "productID=$bug->product", $productName)) echo $productName;
@@ -115,7 +115,7 @@
       <legend><?php echo $lang->bug->legendLife;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <th class='rowhead w-p25'><?php echo $lang->bug->openedBy;?></th>
+          <th class='rowhead w-p20'><?php echo $lang->bug->openedBy;?></th>
           <td> <?php echo $users[$bug->openedBy] . $lang->at . $bug->openedDate;?></td>
         </tr>
         <tr>
@@ -154,7 +154,7 @@
       <legend><?php echo $lang->bug->legendPrjStoryTask;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <td class='rowhead w-p25'><?php echo $lang->bug->project;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->project;?></td>
           <td><?php if($bug->project) echo html::a($this->createLink('project', 'browse', "projectid=$bug->project"), $bug->projectName);?></td>
         </tr>
         <tr>
@@ -171,7 +171,7 @@
       <legend><?php echo $lang->bug->legendMisc;?></legend>
       <table class='table-1 a-left fixed'>
         <tr>
-          <td class='rowhead w-p25'><?php echo $lang->bug->mailto;?></td>
+          <td class='rowhead w-p20'><?php echo $lang->bug->mailto;?></td>
           <td><?php $mailto = explode(',', $bug->mailto); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
         </tr>
         <tr>
diff --git a/trunk/module/project/view/task.html.php b/trunk/module/project/view/task.html.php
index ba874057ea..01ebccc0ae 100644
--- a/trunk/module/project/view/task.html.php
+++ b/trunk/module/project/view/task.html.php
@@ -49,7 +49,7 @@
       <th><?php common::printOrderLink('`left`',   $orderBy, $vars, $lang->task->left);?></th>
       <th><?php common::printOrderLink('type',     $orderBy, $vars, $lang->task->type);?></th>
       <th><?php common::printOrderLink('status',   $orderBy, $vars, $lang->task->status);?></th>
-      <th class='w-p30'><?php common::printOrderLink('story',    $orderBy, $vars, $lang->task->story);?></th>
+      <th class='w-p20'><?php common::printOrderLink('story',    $orderBy, $vars, $lang->task->story);?></th>
       <th class='w-100px'><?php echo $lang->actions;?></th>
     </tr>
     </thead>
diff --git a/trunk/module/task/control.php b/trunk/module/task/control.php
index 3366e655be..da26438637 100644
--- a/trunk/module/task/control.php
+++ b/trunk/module/task/control.php
@@ -150,6 +150,7 @@ class task extends control
         $this->assign('project',  $project);
         $this->assign('task',     $task);
         $this->assign('actions',  $this->action->getList('task', $taskID));
+        $this->assign('users',    $this->loadModel('user')->getPairs('noletter'));
         $this->display();
     }
 
diff --git a/trunk/module/task/lang/zh-cn.php b/trunk/module/task/lang/zh-cn.php
index a0da259be3..588c4e2e51 100644
--- a/trunk/module/task/lang/zh-cn.php
+++ b/trunk/module/task/lang/zh-cn.php
@@ -39,15 +39,15 @@ $lang->task->successSaved        = "成功添加，";
 $lang->task->id        = '编号';
 $lang->task->project   = '所属项目';
 $lang->task->story     = '相关需求';
-$lang->task->name      = '名称';
-$lang->task->type      = '类型';
+$lang->task->name      = '任务名称';
+$lang->task->type      = '任务类型';
 $lang->task->pri       = '优先级';
 $lang->task->owner     = '指派给';
 $lang->task->estimate  = '最初预计';
 $lang->task->left      = '预计剩余';
 $lang->task->consumed  = '已消耗';
-$lang->task->status    = '状态';
-$lang->task->desc      = '描述';
+$lang->task->status    = '任务状态';
+$lang->task->desc      = '任务描述';
 
 $lang->task->statusList->wait  = '未开始';
 $lang->task->statusList->doing = '进行中';
diff --git a/trunk/module/task/view/view.html.php b/trunk/module/task/view/view.html.php
index b7388b85b8..3bff285930 100644
--- a/trunk/module/task/view/view.html.php
+++ b/trunk/module/task/view/view.html.php
@@ -36,7 +36,7 @@
   </div>
 </div>
 
-<div class='yui-d0 yui-t6'>
+<div class='yui-d0 yui-t8'>
   <div class='yui-main'>
     <div class='yui-b'>
       <fieldset>
@@ -44,15 +44,12 @@
         <div><?php echo nl2br($task->desc);?></div>
       </fieldset>
       <?php include '../../common/action.html.php';?>
-      <fieldset>
-        <legend><?php echo $lang->task->legendAction;?></legend>
-        <div class='a-center' style='font-size:16px; font-weight:bold'>
-          <?php
-          if(common::hasPriv('task', 'edit')) echo html::a($this->createLink('task', 'edit', "taskID=$task->id"),  $lang->task->buttonEdit);
-          if(common::hasPriv('project', 'task')) echo html::a($app->session->taskList,  $lang->task->buttonBackToList);
-          ?>
-        </div>
-      </fieldset>
+      <div class='a-center' style='font-size:16px; font-weight:bold'>
+        <?php
+        if(common::hasPriv('task', 'edit')) echo html::a($this->createLink('task', 'edit', "taskID=$task->id"),  $lang->task->buttonEdit);
+        if(common::hasPriv('project', 'task')) echo html::a($app->session->taskList,  $lang->task->buttonBackToList);
+        ?>
+      </div>
     </div>
   </div>
   <div class='yui-b'>
@@ -60,12 +57,12 @@
       <legend><?php echo $lang->task->legendBasic;?></legend>
       <table class='table-1'> 
         <tr>
-          <th class='rowhead'><?php echo $lang->task->project;?></th>
-          <td><?php echo $project->name;?></td>
+          <th class='rowhead w-p20'><?php echo $lang->task->project;?></th>
+          <td><?php if(!common::printLink('project', 'task', "projectID=$task->project", $project->name)) echo $project->name;?></td>
         </tr>  
         <tr>
           <th class='rowhead'><?php echo $lang->task->story;?></th>
-          <td><?php echo $task->storyTitle;?>
+          <td><?php if($task->storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle)) echo $task->storyTitle;?>
         </tr>  
         <tr>
           <th class='rowhead'><?php echo $lang->task->owner;?></th>