diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 6ce0ddb0c1..cc132009d4 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -39,7 +39,8 @@
       <tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
         <td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
         <?php if($longBlock):?>
-        <td class='c-name c-project text-left'><?php echo zget($projects, $product->id, '');?></td>
+        <?php $projectName = zget($projects, $product->id, '');?>
+        <td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo zget($projects, $product->id, '');?></td>
         <?php endif;?>
         <td class="c-num"><?php echo $product->plans?></td>
         <td class="c-num"><?php echo $product->releases?></td>
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index e125c8d359..6de4f89c30 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -135,7 +135,7 @@ $(function()
             </ul>
           </div>
           <?php if($product->stories):?>
-          <div class="col-6">
+          <div class="col-5">
             <div class="product-info">
               <?php $totalPlan     = $product->plans ? array_sum($product->plans) : 0;?>
               <?php $unexpiredPlan = $product->plans ? zget($product->plans, 'unexpired', 0) : 0;?>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 364a8a527b..070c45278f 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -175,7 +175,7 @@ $(function()
                 <div class="type-label">
                   <table class='status-count'>
                     <tr>
-                      <td class='text-right'><?php echo $lang->bug->allBugs . ' Bug';?> :</td>
+                      <td class='text-right'><?php echo $lang->bug->allBugs;?> :</td>
                       <td class='text-left'><?php echo $project->totalBugs;?></td>
                     </tr>
                     <tr>
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 6101362feb..e8bd83ab64 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -41,16 +41,17 @@ if(!$selfCall) die(include('./todolist.html.php'));
       <form class="form-horizontal todoes-form layer" method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'create', 'date=today&account=&from=block');?>'>
         <h3><?php echo $lang->todo->create;?></h3>
         <div class="form-group">
-          <label for="todoName" class="col-sm-2"><?php echo $lang->todo->name?></label>
+          <?php $leftWidth  = $app->getClientLang() == 'en' ? 'col-sm-3' : 'col-sm-2';?>
+          <label for="todoName" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->name?></label>
           <div class="col-sm-9 required"><input type="text" class="form-control" autocomplete="off" name="name"></div>
         </div>
         <div class="form-group">
-          <label for="todoPri" class="col-sm-2"><?php echo $lang->todo->pri?></label>
+          <label for="todoPri" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->pri?></label>
           <div class="col-sm-4"><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></div>
         </div>
         <div class="form-group">
-          <label for="todoDate" class="col-sm-2"><?php echo $lang->todo->date?></label>
-          <div class="col-sm-9 ">
+          <label for="todoDate" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->date?></label>
+          <div class="col-sm-9">
             <div class="input-control has-icon-right">
               <input type="text" class="form-control date" id="todoDate" name="date" placeholder="" autocomplete='off'>
               <label for='todoDate' class="input-control-icon-right"><i class="icon icon-delay"></i></label>
@@ -58,7 +59,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
           </div>
         </div>
         <div class="form-group">
-          <label for="todoBegin" class="col-sm-2"><?php echo $lang->todo->beginAndEnd?></label>
+          <label for="todoBegin" class="<?php echo $leftWidth;?>"><?php echo $lang->todo->beginAndEnd?></label>
           <div class="col-sm-4">
             <select name="begin" id="todoBegin" class="form-control">
               <option value=""><?php echo $lang->todo->lblDisableDate;?></option>
@@ -70,8 +71,8 @@ if(!$selfCall) die(include('./todolist.html.php'));
           </div>
         </div>
         <div class="form-group">
-          <div class="col-sm-2"></div>
-          <div class="col-sm-10">
+          <div class="<?php echo $leftWidth;?>"></div>
+          <div class="col-sm-9">
             <div class="checkbox-primary">
               <input type="checkbox" name="private" id="private" value="1">
               <label for="private"><?php echo $lang->todo->private?></label>
@@ -79,8 +80,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
           </div>
         </div>
         <div class="form-group">
-          <div class="col-sm-2"></div>
-          <div class="col-sm-10 form-actions no-margin">
+          <div class="col-sm-12 form-actions no-margin text-center">
             <?php echo html::hidden('type', 'custom');?>
             <?php echo html::commonButton($lang->save, "onclick='ajaxCreateTodo(this)'", "btn btn-primary btn-wide");?>
             <button type="button" class="btn btn-wide todo-form-trigger" data-trigger="false"><?php echo $lang->goback;?></button>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c8a826a3d1..4e9e69798a 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -348,7 +348,7 @@ $lang->report->menu->test    = array('link' => 'Request|report|bugcreate', 'alia
 $lang->report->menu->staff   = array('link' => 'Company|report|workload');
 
 $lang->report->notice = new stdclass();
-$lang->report->notice->help = 'Note: The data of a report is based on the data in the Story List. Click the tab,e.g. AssignedToMe, then click Report to generate a report.';
+$lang->report->notice->help = 'Note: The data of a report is based on the data in the List. Click the tab, e.g. All, then click Report to generate a report.';
 
 /* Company menu settings. */
 $lang->company = new stdclass();
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index f6ddfb8f7d..6e4c3c5905 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -195,11 +195,11 @@ $lang->resource->story->batchEdit   = 'batchEdit';
 $lang->resource->story->export      = 'export';
 $lang->resource->story->delete      = 'delete';
 $lang->resource->story->view        = 'view';
-$lang->resource->story->change      = 'lblChange';
+$lang->resource->story->change      = 'changeAction';
 $lang->resource->story->review      = 'lblReview';
 $lang->resource->story->batchReview = 'batchReview';
 $lang->resource->story->assignTo    = 'assignTo';
-$lang->resource->story->close       = 'lblClose';
+$lang->resource->story->close       = 'closeAction';
 $lang->resource->story->batchClose  = 'batchClose';
 $lang->resource->story->activate    = 'lblActivate';
 $lang->resource->story->tasks       = 'tasks';
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 66341bdefb..b28fe3ad2b 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -55,9 +55,10 @@
         <td><?php echo $project->end;?></td>
         <td class="c-status">
           <?php if(isset($project->delay)):?>
-          <span class="status-project status-delayed"> <?php echo $lang->project->delayed;?></span>
+          <span class="status-project status-delayed" title='<?php echo $lang->project->delayed;?>'> <?php echo $lang->project->delayed;?></span>
           <?php else:?>
-          <span class="status-project status-<?php echo $project->status?>"> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
+          <?php $statusName = zget($lang->project->statusList, $project->status, '');?>
+          <span class="status-project status-<?php echo $project->status?>" title='<?php echo $statusName;?>'> <?php echo $statusName;?></span>
           <?php endif;?>
         </td>
         <td><?php echo $project->role;?></td>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 0844a8981e..ef1d9ea209 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -56,11 +56,11 @@
           <th class='w-50px'>   <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
           <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
           <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
-          <th class='w-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
           <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
           <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-          <th class='w-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='c-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-actions-5'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index fb1f28d828..2af9d17039 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -202,7 +202,7 @@
                     <td><em><?php echo $product->stories['active']?></em></td>
                     <th><?php echo $lang->product->plans?></th>
                     <td><em><?php echo $product->plans?></em></td>
-                    <th><?php echo $lang->product->bugs?></th>
+                    <th class='w-80px'><?php echo $lang->product->bugs?></th>
                     <td><em><?php echo $product->bugs?></em></td>
                   </tr>
                   <tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index baeeaec607..78d163d33d 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -155,9 +155,9 @@
                     </th>
                     <th class='text-left'><?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
                     <th class='w-100px'>  <?php common::printOrderLink('status',       $orderBy, $vars, $lang->bug->status);?></th>
-                    <th class='w-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
+                    <th class='c-user'>   <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
                     <th class='w-date'>   <?php common::printOrderLink('openedDate',   $orderBy, $vars, $lang->bug->openedDateAB);?></th>
-                    <th class='w-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
+                    <th class='c-user'>   <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
                     <th class='w-100px'>  <?php common::printOrderLink('resolvedDate', $orderBy, $vars, $lang->bug->resolvedDateAB);?></th>
                     <th class='w-50px'>   <?php echo $lang->actions;?></th>
                   </tr>
@@ -301,7 +301,7 @@
                 <div class='detail-content'>
                   <table class='table table-data'>
                     <tr>
-                      <th class='w-80px'><?php echo $lang->release->product;?></th>
+                      <th class='w-90px'><?php echo $lang->release->product;?></th>
                       <td><?php echo $release->productName;?></td>
                     </tr>
                       <?php if($release->productType != 'normal'):?>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index dbff854d6a..72a9abbeed 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -42,6 +42,7 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-90px';
 #queryBox select#groupAndOr {padding-right:2px; padding-left:5px;}
 #queryBox .chosen-container-single .chosen-single>span {margin-right:5px;}
 
+#queryBox .form-actions .btn {margin-right: 5px;}
 #userQueries {border-left: 1px solid #eee; vertical-align: top;}
 #userQueries > h4 {margin: 0 0 6px;}
 #userQueries ul {list-style: none; padding-left: 0; margin: 0; max-height:75px; overflow:auto;}
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 7b1c5539b0..46cbcd8e2b 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -9,39 +9,41 @@
  * @version     $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->story->create      = "Create Story";
-$lang->story->batchCreate = "Batch Create Stories";
-$lang->story->change      = "Change Story";
-$lang->story->changed     = 'Change';
-$lang->story->assignTo    = 'Assign';
-$lang->story->review      = 'Review';
-$lang->story->needReview  = 'Need Review';
-$lang->story->batchReview = 'Batch Review';
-$lang->story->edit        = "Edit Story";
-$lang->story->batchEdit   = "Batch Edit";
-$lang->story->subdivide   = 'Decompose';
-$lang->story->close       = 'Close Story';
-$lang->story->batchClose  = 'Batch Close';
-$lang->story->activate    = 'Activate';
-$lang->story->delete      = "Delete";
-$lang->story->view        = "Story Detail";
-$lang->story->setting     = "Settings";
-$lang->story->tasks       = "Linked Tasks";
-$lang->story->bugs        = "Linked Bugs";
-$lang->story->cases       = "Linked Cases";
-$lang->story->taskCount   = 'Tasks';
-$lang->story->bugCount    = 'Bugs';
-$lang->story->caseCount   = 'Cases';
-$lang->story->taskCountAB = 'T';
-$lang->story->bugCountAB  = 'B';
-$lang->story->caseCountAB = 'C';
-$lang->story->linkStory   = 'Link Story';
-$lang->story->unlinkStory = 'UnLinked';
-$lang->story->export      = "Export";
-$lang->story->zeroCase    = "Story with 0 case";
-$lang->story->zeroTask    = "Story with 0 task";
-$lang->story->reportChart = "Report";
-$lang->story->copyTitle   = "Copy Title";
+$lang->story->create       = "Create Story";
+$lang->story->batchCreate  = "Batch Create Stories";
+$lang->story->change       = "Change";
+$lang->story->changeAction = "Change Story";
+$lang->story->changed      = 'Change';
+$lang->story->assignTo     = 'Assign';
+$lang->story->review       = 'Review';
+$lang->story->needReview   = 'Need Review';
+$lang->story->batchReview  = 'Batch Review';
+$lang->story->edit         = "Edit Story";
+$lang->story->batchEdit    = "Batch Edit";
+$lang->story->subdivide    = 'Decompose';
+$lang->story->close        = 'Close';
+$lang->story->closeAction  = 'Close Story';
+$lang->story->batchClose   = 'Batch Close';
+$lang->story->activate     = 'Activate';
+$lang->story->delete       = "Delete";
+$lang->story->view         = "Story Detail";
+$lang->story->setting      = "Settings";
+$lang->story->tasks        = "Linked Tasks";
+$lang->story->bugs         = "Linked Bugs";
+$lang->story->cases        = "Linked Cases";
+$lang->story->taskCount    = 'Tasks';
+$lang->story->bugCount     = 'Bugs';
+$lang->story->caseCount    = 'Cases';
+$lang->story->taskCountAB  = 'T';
+$lang->story->bugCountAB   = 'B';
+$lang->story->caseCountAB  = 'C';
+$lang->story->linkStory    = 'Link Story';
+$lang->story->unlinkStory  = 'UnLinked';
+$lang->story->export       = "Export";
+$lang->story->zeroCase     = "Story with 0 case";
+$lang->story->zeroTask     = "Story with 0 task";
+$lang->story->reportChart  = "Report";
+$lang->story->copyTitle    = "Copy Title";
 $lang->story->batchChangePlan   = "Batch Change Plans";
 $lang->story->batchChangeBranch = "Batch Change Branches";
 $lang->story->batchChangeStage  = "Batch Change Phases";
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 088b596b9e..ae143d7e3e 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -9,39 +9,41 @@
  * @version     $Id: zh-cn.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->story->create      = "提需求";
-$lang->story->batchCreate = "批量创建";
-$lang->story->change      = "变更";
-$lang->story->changed     = '需求变更';
-$lang->story->assignTo    = '指派';
-$lang->story->review      = '评审';
-$lang->story->needReview  = '需要评审';
-$lang->story->batchReview = '批量评审';
-$lang->story->edit        = "编辑";
-$lang->story->batchEdit   = "批量编辑";
-$lang->story->subdivide   = '细分';
-$lang->story->close       = '关闭';
-$lang->story->batchClose  = '批量关闭';
-$lang->story->activate    = '激活';
-$lang->story->delete      = "删除";
-$lang->story->view        = "需求详情";
-$lang->story->setting     = "设置";
-$lang->story->tasks       = "相关任务";
-$lang->story->bugs        = "相关Bug";
-$lang->story->cases       = "相关用例";
-$lang->story->taskCount   = '任务数';
-$lang->story->bugCount    = 'Bug数';
-$lang->story->caseCount   = '用例数';
-$lang->story->taskCountAB = 'T';
-$lang->story->bugCountAB  = 'B';
-$lang->story->caseCountAB = 'C';
-$lang->story->linkStory   = '关联需求';
-$lang->story->unlinkStory = '移除相关需求';
-$lang->story->export      = "导出数据";
-$lang->story->zeroCase    = "零用例需求";
-$lang->story->zeroTask    = "只列零任务需求";
-$lang->story->reportChart = "统计报表";
-$lang->story->copyTitle   = "同需求名称";
+$lang->story->create       = "提需求";
+$lang->story->batchCreate  = "批量创建";
+$lang->story->change       = "变更";
+$lang->story->changeAction = "变更需求";
+$lang->story->changed      = '需求变更';
+$lang->story->assignTo     = '指派';
+$lang->story->review       = '评审';
+$lang->story->needReview   = '需要评审';
+$lang->story->batchReview  = '批量评审';
+$lang->story->edit         = "编辑";
+$lang->story->batchEdit    = "批量编辑";
+$lang->story->subdivide    = '细分';
+$lang->story->close        = '关闭';
+$lang->story->closeAction  = '关闭需求';
+$lang->story->batchClose   = '批量关闭';
+$lang->story->activate     = '激活';
+$lang->story->delete       = "删除";
+$lang->story->view         = "需求详情";
+$lang->story->setting      = "设置";
+$lang->story->tasks        = "相关任务";
+$lang->story->bugs         = "相关Bug";
+$lang->story->cases        = "相关用例";
+$lang->story->taskCount    = '任务数';
+$lang->story->bugCount     = 'Bug数';
+$lang->story->caseCount    = '用例数';
+$lang->story->taskCountAB  = 'T';
+$lang->story->bugCountAB   = 'B';
+$lang->story->caseCountAB  = 'C';
+$lang->story->linkStory    = '关联需求';
+$lang->story->unlinkStory  = '移除相关需求';
+$lang->story->export       = "导出数据";
+$lang->story->zeroCase     = "零用例需求";
+$lang->story->zeroTask     = "只列零任务需求";
+$lang->story->reportChart  = "统计报表";
+$lang->story->copyTitle    = "同需求名称";
 $lang->story->batchChangePlan   = "批量修改计划";
 $lang->story->batchChangeBranch = "批量修改分支";
 $lang->story->batchChangeStage  = "批量修改阶段";
diff --git a/module/task/css/report.css b/module/task/css/report.css
index 48aa348846..8b1c52e565 100644
--- a/module/task/css/report.css
+++ b/module/task/css/report.css
@@ -1,6 +1,7 @@
 .table-bordered caption {border: 1px solid #ddd;}
 .table-bordered tr > th:first-child, .table-bordered tr > td:first-child {border-left: 1px solid #ddd!important}
 .table-bordered tr > th:last-child, .table-bordered tr > td:last-child {border-right: 1px solid #ddd!important}
+.side-col.col-lg{width:270px;}
 
 .panel-heading > strong > span {float: right; color: #29a8cd;}
 
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index c08aa1b077..62f663224b 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -82,6 +82,7 @@ $lang->testcase->batchCreate             = "Batch Add";
 $lang->testcase->delete                  = "Delete";
 $lang->testcase->view                    = "Overview";
 $lang->testcase->review                  = "Need Review";
+$lang->testcase->reviewAB                = "Review";
 $lang->testcase->batchReview             = "Batch Review";
 $lang->testcase->edit                    = "Edit Case";
 $lang->testcase->batchEdit               = "Batch Edit ";
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 6ff1095500..b9213c690b 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -82,6 +82,7 @@ $lang->testcase->batchCreate             = "批量建用例";
 $lang->testcase->delete                  = "删除用例";
 $lang->testcase->view                    = "用例详情";
 $lang->testcase->review                  = "评审";
+$lang->testcase->reviewAB                = "评审";
 $lang->testcase->batchReview             = "批量评审";
 $lang->testcase->edit                    = "编辑";
 $lang->testcase->batchEdit               = "批量编辑 ";
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 5b3a07c532..c7eddaabb7 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -111,7 +111,7 @@
 
             if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
         }
-        if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe');
+        if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe', '', '', $lang->testcase->reviewAB);
         ?>
         <?php
         common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 1408969209..fb6c6188e3 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -137,11 +137,12 @@
         <div class='detail-content'>
           <table class='table table-data'>
             <tr>
-              <th class='w-80px'><?php echo $lang->todo->beginAndEnd?></th>
+              <?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
+              <th class='<?php echo $colWidth;?>'><?php echo $lang->todo->beginAndEnd?></th>
               <td><?php echo $todo->config->begin . " ~ " . $todo->config->end;?></td>
             </tr>
             <tr>
-              <th class='w-80px text-top'><?php echo $lang->todo->cycleConfig?></th>
+              <th class='<?php echo $colWidth;?> text-top'><?php echo $lang->todo->cycleConfig?></th>
               <td>
                 <?php
                 if($todo->config->type == 'day')
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 03df163154..d19b512d4a 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -29,3 +29,4 @@
 
 .side .leftmenu .nav-primary>li.active>a { background-color: #e7f1fc;}
 .side .leftmenu .nav-primary>li.active>a:hover {background-color: #006af1;}
+.label-severity:after{z-index:0 !important;}
diff --git a/www/theme/lang/en.css b/www/theme/lang/en.css
index 4a48d7dc47..6a08855fce 100644
--- a/www/theme/lang/en.css
+++ b/www/theme/lang/en.css
@@ -6,4 +6,5 @@
 .main-actions .btn-toolbar .btn+.btn-group {margin-left: 5px !important;}
 .main-actions .btn-toolbar { padding: 4px 5px;}
 
-.c-user{width:90px !important;}
+.c-user{width:95px !important;}
+.c-hours{width:65px !important;}