diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index abc5c17e2d..37727c07f9 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -45,9 +45,10 @@
         <?php if($longBlock):?>
         <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 class="c-hours"><?php echo $project->hours->totalEstimate;?></td>
diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php
index 9dbb256db8..b7e5bbe4a0 100644
--- a/module/dept/view/edit.html.php
+++ b/module/dept/view/edit.html.php
@@ -23,15 +23,16 @@ $jsRoot  = $webRoot . "js/";
     <form action="<?php echo inlink('edit', 'deptID=' . $dept->id);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
       <table class='table table-form' style='width:100%'>
         <tr>
-          <th class='w-80px'><?php echo $lang->dept->parent;?></th>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-80px';?>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->dept->parent;?></th>
           <td><?php echo html::select('parent', $optionMenu, $dept->parent, "class='form-control chosen'");?></td>
         </tr>
         <tr>
-          <th class='w-80px'><?php echo $lang->dept->name;?></th>
+          <th><?php echo $lang->dept->name;?></th>
           <td><?php echo html::input('name', $dept->name, "class='form-control'");?></td>
         </tr>
         <tr>
-          <th class='w-80px'><?php echo $lang->dept->manager;?></th>
+          <th><?php echo $lang->dept->manager;?></th>
           <td><?php echo html::select('manager', $users, $dept->manager, "class='form-control chosen'", true);?></td>
         </tr>
         <tr>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 19fa620b03..f6ddfb8f7d 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -401,7 +401,7 @@ $lang->resource->task->assignTo           = 'assign';
 $lang->resource->task->start              = 'start';
 $lang->resource->task->pause              = 'pause';
 $lang->resource->task->restart            = 'restart';
-$lang->resource->task->finish             = 'finish';
+$lang->resource->task->finish             = 'finishAction';
 $lang->resource->task->cancel             = 'cancel';
 $lang->resource->task->close              = 'close';
 $lang->resource->task->batchCreate        = 'batchCreate';
@@ -410,7 +410,7 @@ $lang->resource->task->batchClose         = 'batchClose';
 $lang->resource->task->batchCancel        = 'batchCancel';
 $lang->resource->task->batchAssignTo      = 'batchAssignTo';
 $lang->resource->task->batchChangeModule  = 'batchChangeModule';
-$lang->resource->task->activate           = 'activate';
+$lang->resource->task->activate           = 'activateAction';
 $lang->resource->task->delete             = 'delete';
 $lang->resource->task->view               = 'view';
 $lang->resource->task->export             = 'export';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 2a6602ed75..5aeb5847c3 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -26,11 +26,13 @@ $lang->task->logEfforts          = "Effort";
 $lang->task->record              = "Estimates";
 $lang->task->start               = "Start";
 $lang->task->restart             = "Continue";
-$lang->task->finish              = "Finish Task";
+$lang->task->finishAction        = "Finish Task";
+$lang->task->finish              = "Finish";
 $lang->task->pause               = "Pause";
 $lang->task->close               = "Close";
 $lang->task->cancel              = "Cancel";
-$lang->task->activate            = "Activate Task";
+$lang->task->activateAction      = "Activate Task";
+$lang->task->activate            = "Activate";
 $lang->task->export              = "Export";
 $lang->task->reportChart         = "Report Chart";
 $lang->task->fromBug             = 'From Bug';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 5aec3f7bc1..817f0088ea 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -26,10 +26,12 @@ $lang->task->logEfforts          = "记录工时";
 $lang->task->record              = "工时";
 $lang->task->start               = "开始";
 $lang->task->restart             = "继续";
+$lang->task->finishAction        = "完成任务";
 $lang->task->finish              = "完成";
 $lang->task->pause               = "暂停";
 $lang->task->close               = "关闭";
 $lang->task->cancel              = "取消";
+$lang->task->activateAction      = "激活任务";
 $lang->task->activate            = "激活";
 $lang->task->export              = "导出数据";
 $lang->task->reportChart         = "报表统计";
@@ -38,6 +40,7 @@ $lang->task->case                = '相关用例';
 $lang->task->confirmStoryChange  = "确认需求变动";
 $lang->task->storyChange         = "需求变更";
 $lang->task->progress            = '进度';
+$lang->task->progressAB          = '%';
 $lang->task->progressTips        = '已消耗/(已消耗+剩余)';
 $lang->task->copy                = '复制任务';
 $lang->task->waitTask            = '未开始的任务';
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 717c7a440f..33580f591d 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -123,7 +123,7 @@ $config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['openedBy']['title']    = 'openedByAB';
 $config->testcase->datatable->fieldList['openedBy']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['openedBy']['width']    = '80';
+$config->testcase->datatable->fieldList['openedBy']['width']    = '90';
 $config->testcase->datatable->fieldList['openedBy']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['openedDate']['title']    = 'openedDate';
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 70eab0c1cd..6d84102772 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -33,7 +33,7 @@
     <table class='table tablesorter' id='testcaseList'>
       <thead>
         <tr>
-          <th class='w-id'>
+          <th class='c-id'>
             <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
               <label></label>
             </div>
@@ -43,8 +43,8 @@
           <th class='w-pri text-center'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->testcase->title;?></th>
           <th class='w-type'><?php echo $lang->testcase->type;?></th>
-          <th class='w-user text-center'><?php echo $lang->openedByAB;?></th>
-          <th class='w-status text-center'><?php echo $lang->statusAB;?></th>
+          <th class='c-user text-center'><?php echo $lang->openedByAB;?></th>
+          <th class='c-status text-center'><?php echo $lang->statusAB;?></th>
         </tr>
       </thead>
       <tbody>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 0d9b20a59d..1408969209 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -93,7 +93,8 @@
         <div class='detail-content'>
           <table class='table table-data'>
             <tr>
-              <th class='w-90px'><?php echo $lang->todo->pri;?></th>
+              <?php $colWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-80px';?>
+              <th class='<?php echo $colWidth;?>'><?php echo $lang->todo->pri;?></th>
               <td><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
             </tr>
             <tr>
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index 2e28a0c87d..1d54deb98f 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -23,32 +23,33 @@ js::set('type', $type);
   <div class='modal-body'>
     <form action="<?php echo inlink('edit', 'module=' . $module->id .'&type=' .$type);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
       <table class='table table-form'>
+        <?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
         <?php if($showProduct):?>
         <tr>
-          <th class='w-80px'><?php echo $lang->tree->product;?></th>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->tree->product;?></th>
           <td><?php echo html::select('root', $products, $module->root, "class='form-control chosen'");?></td>
         </tr>
         <?php endif;?>
         <?php $hidden = ($type != 'story' and $module->type == 'story');?>
         <?php if($type == 'doc'):?>
         <tr>
-          <th class='w-80px'><?php echo $lang->doc->lib;?></th>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->doc->lib;?></th>
           <td><?php echo html::select('root', $libs, $module->root, "class='form-control chosen' onchange=loadDocModule(this.value)");?></td>
         </tr>
         <?php endif;?>
         <?php if($module->type != 'line'):?>
         <tr <?php if($hidden) echo "style='display:none'";?>>
-          <th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->parentCate : $lang->tree->parent;?></th>
+          <th class='<?php echo $colWidth;?>'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->parentCate : $lang->tree->parent;?></th>
           <td><?php echo html::select('parent', $optionMenu, $module->parent, "class='form-control chosen'");?></td>
         </tr>
         <?php endif;?>
         <tr <?php if($hidden) echo "style='display:none'";?>>
-          <th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->cate : $lang->tree->name;?></th>
+          <th class='<?php echo $colWidth;?>'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->cate : $lang->tree->name;?></th>
           <td><?php echo html::input('name', $module->name, "class='form-control'");?></td>
         </tr>
         <?php if($type == 'bug'):?>
         <tr>
-          <th class='w-80px'><?php echo $lang->tree->owner;?></th>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->tree->owner;?></th>
           <td><?php echo html::select('owner', $users, $module->owner, "class='form-control chosen'", true);?></td>
         </tr>
         <?php endif;?>
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 0f156b9b90..9784ee1b75 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -25,6 +25,7 @@
   $visibleFields = array();
   foreach(explode(',', $showFields) as $field)
   {
+      if(strpos(",{$config->user->customBatchCreateFields},", $field) === false) continue;
       if($field) $visibleFields[$field] = '';
   }
   $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
@@ -36,12 +37,14 @@
           <tr class='text-center'>
             <th class='w-40px'><?php echo $lang->idAB;?></th> 
             <th class='w-150px<?php echo zget($visibleFields, 'dept', ' hidden')?>'><?php echo $lang->user->dept;?></th>
-            <th class='w-180px required'><?php echo $lang->user->account;?></th>
+            <?php $colWidth = $app->getClientLang() == 'en' ? 'w-200px' : 'w-180px';?>
+            <th class='<?php echo $colWidth;?> required'><?php echo $lang->user->account;?></th>
             <th class='w-130px required'><?php echo $lang->user->realname;?></th>
             <th class='w-120px'><?php echo $lang->user->role;?></th>
             <th class='w-120px'><?php echo $lang->user->group;?></th>
             <th class='<?php echo zget($visibleFields, 'email', "$minWidth hidden", $minWidth)?>'><?php echo $lang->user->email;?></th>
-            <th class='w-90px<?php echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
+            <?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-90px';?>
+            <th class='<?php echo $colWidth; echo zget($visibleFields, 'gender', ' hidden')?>'><?php echo $lang->user->gender;?></th>
             <th class="<?php echo $minWidth;?> required"><?php echo $lang->user->password;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'commiter', ' hidden')?>'><?php echo $lang->user->commiter;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 81e242d39d..443a45d4c8 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -24,6 +24,7 @@
   $visibleFields = array();
   foreach(explode(',', $showFields) as $field)
   {
+      if(strpos(",{$config->user->customBatchEditFields},", $field) === false) continue;
       if($field)$visibleFields[$field] = '';
   }
   $minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
diff --git a/www/theme/lang/en.css b/www/theme/lang/en.css
index dd899e2e1b..4a48d7dc47 100644
--- a/www/theme/lang/en.css
+++ b/www/theme/lang/en.css
@@ -5,3 +5,5 @@
 .main-actions .btn-toolbar .btn+.btn { margin-left: 0px !important;}
 .main-actions .btn-toolbar .btn+.btn-group {margin-left: 5px !important;}
 .main-actions .btn-toolbar { padding: 4px 5px;}
+
+.c-user{width:90px !important;}