diff --git a/module/admin/view/log.html.php b/module/admin/view/log.html.php
index a0c52c706d..1ec9ff5ea9 100644
--- a/module/admin/view/log.html.php
+++ b/module/admin/view/log.html.php
@@ -10,10 +10,13 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
+<?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-600px'>
+  <div class='main-header'>
+    <h2><?php echo $lang->webhook->setting;?></h2>
+  </div>
+  <div class='center-block mw-700px'>
     <form id='logForm' method='post' class='ajaxForm'>
       <table class='table table-form'>
         <tr>
@@ -31,7 +34,4 @@
     </form>
   </div>
 </div>
-<script>
-$(function(){$('#mainMenu #webhookTab').addClass('btn-active-text');})
-</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index ebf91e4c8e..a904abee7e 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -22,8 +22,9 @@
     <form class="load-indicator main-form form-ajax" method='post'>
       <table class='table table-form'>
         <tr>
-          <th class='w-130px'><?php echo $lang->admin->safe->password?></th>
-          <td class='w-200px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-300px' : 'w-130px';?>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->admin->safe->password?></th>
+          <td class='w-230px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
           <td><?php echo $lang->admin->safe->noticeMode?></td>
         </tr>
         <tr id='mode1Rule' class='hidden'>
diff --git a/module/bug/control.php b/module/bug/control.php
index f1365cc19b..6349fcf4db 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -181,7 +181,7 @@ class bug extends control
      * @access public
      * @return void
      */
-    public function report($productID, $browseType, $branchID, $moduleID, $chartType = '')
+    public function report($productID, $browseType, $branchID, $moduleID, $chartType = 'default')
     {
         $this->loadModel('report');
         $this->view->charts   = array();
diff --git a/module/bug/view/report.html.php b/module/bug/view/report.html.php
index 674d41f772..b069220d49 100644
--- a/module/bug/view/report.html.php
+++ b/module/bug/view/report.html.php
@@ -43,7 +43,7 @@
     <div class='cell'>
       <div class='btn-toolbar'>
         <?php foreach($lang->report->typeList as $type => $typeName):?>
-        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
+        <?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type} muted'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
         <?php endforeach;?>
         <div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
       </div>
diff --git a/module/build/css/create.css b/module/build/css/create.css
new file mode 100644
index 0000000000..c07e19ef8c
--- /dev/null
+++ b/module/build/css/create.css
@@ -0,0 +1 @@
+#product_chosen .chosen-single{border-right:0px;}
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 4e9e69798a..49572d6e4e 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -262,7 +262,6 @@ $lang->task  = new stdclass();
 $lang->build = new stdclass();
 $lang->task->menu  = $lang->project->menu;
 $lang->build->menu = $lang->project->menu;
-$lang->build->menu->qa = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
 
 /* QA menu settings. */
 $lang->qa = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index eda5876cef..5816725194 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -262,7 +262,6 @@ $lang->task  = new stdclass();
 $lang->build = new stdclass();
 $lang->task->menu  = $lang->project->menu;
 $lang->build->menu = $lang->project->menu;
-$lang->build->menu->qa = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
 
 /* QA视图菜单设置。*/
 $lang->qa = new stdclass();
diff --git a/module/company/view/edit.html.php b/module/company/view/edit.html.php
index c939b1fd17..1165a3b07a 100644
--- a/module/company/view/edit.html.php
+++ b/module/company/view/edit.html.php
@@ -23,7 +23,8 @@
   <form class='main-form' method='post' target='hiddenwin'>
     <table class='table table-form'> 
       <tr>
-        <th><?php echo $lang->company->name;?></th>
+        <?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
+        <th class='<?php echo $colWidth;?>'><?php echo $lang->company->name;?></th>
         <td><?php echo html::input('name', $company->name, "class='form-control'");?></td>
       </tr>  
       <tr>
diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php
index 6c46bbe157..9baf324790 100644
--- a/module/custom/view/set.html.php
+++ b/module/custom/view/set.html.php
@@ -54,7 +54,8 @@ EOT;
       <?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
       <table class='table table-form mw-800px'>
         <tr>
-          <th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-80px';?>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->custom->storyReview;?></th>
           <td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
           <td></td>
         </tr>
diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index 623f204520..7d937bc132 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -110,19 +110,19 @@ $(function()
             sort:
             {
                 title: '<?php echo $lang->dept->dragAndSort ?>',
-                template: '<a class="sort-handler" href="javascript:;"><?php echo $lang->sort;?></a>'
+                template: '<a class="sort-handler"><i class="icon-move"></i></a>'
             },
             edit:
             {
                 linkTemplate: '<?php echo helper::createLink('dept', 'edit', "deptid={0}"); ?>',
                 title: '<?php echo $lang->dept->edit ?>',
-                template: '<a href="javascript:;" data-width="600"><?php echo $lang->edit?></a>'
+                template: '<a><i class="icon-edit"></i></a>'
             },
             "delete":
             {
                 linkTemplate: '<?php echo helper::createLink('dept', 'delete', "deptid={0}"); ?>',
                 title: '<?php echo $lang->dept->delete ?>',
-                template: '<a href="javascript:;"><?php echo $lang->delete?></a>'
+                template: '<a><i class="icon-trash"></i></a>'
             }
         },
         action: function(event)
diff --git a/module/doc/control.php b/module/doc/control.php
index b72b132e6e..a4a9a78c04 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -809,7 +809,6 @@ class doc extends control
         }
         elseif($from == 'project')
         {
-            $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
             $this->lang->doc->menu      = $this->lang->project->menu;
             $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
             $this->project->setMenu($this->project->getPairs('nocode'), $objectID);
diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php
index ef406cf078..adda824901 100644
--- a/module/message/view/setting.html.php
+++ b/module/message/view/setting.html.php
@@ -47,7 +47,12 @@
           ?>
           <td>
           <?php
-          echo html::checkbox("messageSetting[$type][setting][$objectType]", $availableActions, isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '');
+          $selected = isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '';
+          foreach($availableActions as $key => $value)
+          {
+              $checked = strpos(",$selected,", ",{$key},") !== false ? "checked='checked'" : '';
+              echo "<div class='checkbox-primary' title='$value'><input type='checkbox' name='messageSetting[$type][setting][$objectType][]' value='$key' $checked id='messageSetting[$type][setting][$objectType]$key'> <label for='messageSetting[$type][setting][$objectType]$key'>$value</label></div>";
+          }
           if(isset($config->message->condition[$type][$objectType]))
           {
               $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
diff --git a/module/my/control.php b/module/my/control.php
index 69b0bbe6fd..a9559267ec 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -393,7 +393,7 @@ class my extends control
         {
             $this->user->updatePassword($this->app->user->id);
             if(dao::isError()) die(js::error(dao::getError()));
-            die(js::locate($this->createLink('my', 'profile'), 'parent'));
+            die(js::locate($this->createLink('my', 'profile'), 'parent.parent'));
         }
 
         $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword;
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 5cebb8b458..05eb223b76 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -94,7 +94,7 @@
             <?php endforeach;?>
             <?php endif;?>
             <dt><?php echo $lang->user->address;?></dt>
-            <dd><?php echo $user->address;?></dd>
+            <dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
             <dt><?php echo $lang->user->zipcode;?></dt>
             <dd><?php echo $user->zipcode;?></dd>
           </dl>
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 818d025893..9b35d57e6b 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -57,7 +57,7 @@ $lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
 $lang->product->accessDenied   = "You have no access to the {$lang->productCommon}.";
 
 $lang->product->id            = 'ID';
-$lang->product->name          = 'Product Name';
+$lang->product->name          = "{$lang->productCommon} Name";
 $lang->product->code          = 'Code';
 $lang->product->line          = "{$lang->productCommon} Line";
 $lang->product->order         = 'Rank';
@@ -66,7 +66,7 @@ $lang->product->typeAB        = 'Type';
 $lang->product->status        = 'Status';
 $lang->product->desc          = 'Description';
 $lang->product->manager       = 'Managers';
-$lang->product->PO            = 'Product Owner';
+$lang->product->PO            = "{$lang->productCommon} Owner";
 $lang->product->QD            = 'QA Manager';
 $lang->product->RD            = 'Release Manager';
 $lang->product->acl           = 'ACL';
diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index cbe413726a..e0b6116eb4 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -194,6 +194,7 @@ $(function()
             shown:  function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
             hidden: refresh
         });
-		return false;
+        return false;
     });
+    setTimeout(function(){$('#kanban .c-side.has-btn').removeAttr('title');}, 500);
 });
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index b686bd3d51..d592b84e7b 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -36,6 +36,7 @@ $lang->project->release       = 'Release';
 $lang->project->acl           = 'ACL';
 $lang->project->teamname      = 'Team Name';
 $lang->project->order         = "Rank {$lang->projectCommon}";
+$lang->project->orderAB       = "Rank";
 $lang->project->products      = "Link {$lang->productCommon}";
 $lang->project->whitelist     = 'Whitelist';
 $lang->project->totalEstimate = 'Estimates';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 973ca21953..bb863c0078 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -36,6 +36,7 @@ $lang->project->release       = '发布';
 $lang->project->acl           = '访问控制';
 $lang->project->teamname      = '团队名称';
 $lang->project->order         = $lang->projectCommon . '排序';
+$lang->project->orderAB       = '排序';
 $lang->project->products      = '相关' . $lang->productCommon;
 $lang->project->whitelist     = '分组白名单';
 $lang->project->totalEstimate = '预计';
diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php
index 484829e5b0..344bf80eed 100644
--- a/module/project/view/all.html.php
+++ b/module/project/view/all.html.php
@@ -43,7 +43,8 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
           <th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
-          <th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : '1-100px';?>
+          <th class='<?php echo $colWidth;?>'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
           <th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
           <th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>
           <th class='w-70px'><?php echo $lang->project->totalEstimate;?></th>
@@ -52,7 +53,7 @@
           <th class='w-150px'><?php echo $lang->project->progress;?></th>
           <th class='w-100px'><?php echo $lang->project->burn;?></th>
           <?php if($canOrder):?>
-          <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
+          <th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
           <?php endif;?>
         </tr>
       </thead>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 32784e2537..6fc0fd6cf2 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -54,9 +54,9 @@
           <th class='w-80px'>    <?php common::printOrderLink('severity',     $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri'>     <?php common::printOrderLink('pri',          $orderBy, $vars, $lang->priAB);?></th>
           <th>                   <?php common::printOrderLink('title',        $orderBy, $vars, $lang->bug->title);?></th>
-          <th class='w-user'>    <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
-          <th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
-          <th class='w-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+          <th class='c-user'>    <?php common::printOrderLink('openedBy',     $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='w-110px c-user'><?php common::printOrderLink('assignedTo',   $orderBy, $vars, $lang->assignedToAB);?></th>
+          <th class='c-user'>    <?php common::printOrderLink('resolvedBy',   $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
           <th class='c-actions-5'><?php echo $lang->actions;?></th>
         </tr>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index 987cba2a11..33294ba60b 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -48,7 +48,7 @@
           <?php if($productType != 'normal'):?>
           <th class='w-80px'><?php echo $lang->product->branchName[$productType];?></th>
           <?php endif;?>
-          <th class='w-user'><?php echo $lang->openedByAB;?></th>
+          <th class='c-user'><?php echo $lang->openedByAB;?></th>
           <th class='w-80px text-center'><?php echo $lang->story->estimateAB;?></th>
         </tr>
       </thead>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 22db1b9d5b..20d06bb628 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -27,16 +27,11 @@
           <?php $checked = 'checked';?>
           <div class='col-sm-4'>
             <div class='product <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
-              <div class="checkbox-primary">
+              <div class="checkbox-primary" title='<?php echo $productName;?>'>
                 <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'>";?>
-                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
+                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>' title='<?php echo $productName;?>'><?php echo $productName;?></label>
               </div>
-              <?php
-              if(isset($branchGroups[$productID]))
-              {
-                  echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
-              }
-              ?>
+              <?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");?>
             </div>
           </div>
           <?php unset($allProducts[$productID]);?>
@@ -50,16 +45,11 @@
           <?php foreach($allProducts as $productID => $productName):?>
           <div class='col-sm-4'>
             <div class='product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
-              <div class="checkbox-primary">
+              <div class="checkbox-primary" title='<?php echo $productName;?>'>
                 <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'>";?>
-                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
+                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>'><?php echo $productName;?></label>
               </div>
-              <?php
-              if(isset($branchGroups[$productID]))
-              {
-                  echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
-              }
-              ?>
+              <?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");?>
             </div>
           </div>
           <?php endforeach;?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index ca66d82a89..3f3db33df1 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -104,7 +104,7 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <?php if($canOrder):?>
-            <th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order',      $orderBy, $vars, $lang->project->updateOrder);?></th>
+            <th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order',      $orderBy, $vars, $lang->project->orderAB);?></th>
             <?php endif;?>
             <th class='c-pri {sorter:false}'>  <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
             <th class='c-name {sorter:false}'> <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 631a42607e..00ff3afdb0 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -133,7 +133,7 @@
                 <?php $i++;?>
                 <?php endforeach;?>
                 <div class="col-xs-6">
-                  <?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createLib, '', "class='text-muted iframe'");?>
+                  <?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?>
                 </div>
                 <?php endif;?>
               </div>
diff --git a/module/report/view/blockreportlist.html.php b/module/report/view/blockreportlist.html.php
index 3feb15c02d..1e9394db18 100644
--- a/module/report/view/blockreportlist.html.php
+++ b/module/report/view/blockreportlist.html.php
@@ -11,7 +11,7 @@
           $list .= '|';
           list($label, $module, $method, $params) = explode('|', $list);
           $class = $label == $title ? 'selected' : '';
-          if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class'");
+          if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class' title='$label'");
       }
       ?>
     </div>
diff --git a/module/task/control.php b/module/task/control.php
index f849c3c2fc..2c7f9088e5 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1200,7 +1200,7 @@ class task extends control
      * @access public
      * @return void
      */
-    public function report($projectID, $browseType = 'all', $chartType = '')
+    public function report($projectID, $browseType = 'all', $chartType = 'default')
     {
         $this->loadModel('report');
         $this->view->charts   = array();
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 5aeb5847c3..0407351d55 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -98,7 +98,7 @@ $lang->task->closedReason      = 'CloseReason';
 $lang->task->lastEditedBy      = 'ModifiedBy';
 $lang->task->lastEditedDate    = 'ModifiedDate';
 $lang->task->lastEdited        = 'Last Edited';
-$lang->task->recordEstimate    = '%';
+$lang->task->recordEstimate    = 'Effort';
 $lang->task->editEstimate      = 'Edit Estimates';
 $lang->task->deleteEstimate    = 'Delete Estimates';
 $lang->task->colorTag          = 'Color';
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 5d28aab526..25a89a971e 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -41,8 +41,9 @@
           <tr class='text-center'>
             <th class="w-id"><?php echo $lang->idAB;?></th>
             <th class="w-120px"><?php echo $lang->task->date;?></th>
-            <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
-            <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
+            <?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
+            <th class="<?php echo $colWidth;?>"><?php echo $lang->task->consumed;?></th>
+            <th class="<?php echo $colWidth;?>"><?php echo $lang->task->left;?></th>
             <th><?php echo $lang->comment;?></th>
             <th class='c-actions-2'><?php if(empty($task->team) or $task->assignedTo == $this->app->user->account) echo $lang->actions;?></th>
           </tr>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 33580f591d..79b81d39e9 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -118,7 +118,7 @@ $config->testcase->datatable->fieldList['keywords']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['assignedTo']['title']    = 'assignedTo';
 $config->testcase->datatable->fieldList['assignedTo']['fixed']    = 'no';
-$config->testcase->datatable->fieldList['assignedTo']['width']    = '80';
+$config->testcase->datatable->fieldList['assignedTo']['width']    = '120';
 $config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['openedBy']['title']    = 'openedByAB';
diff --git a/module/testtask/js/groupcase.js b/module/testtask/js/groupcase.js
index 8157df3154..25edbaec4d 100644
--- a/module/testtask/js/groupcase.js
+++ b/module/testtask/js/groupcase.js
@@ -1,4 +1,5 @@
 $(document).ready(function()
 {
     $('#' + browseType + 'Tab').addClass('active');
+    $('.c-side.has-btn').removeAttr('title');
 });
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 9784ee1b75..6175dd4df1 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -25,7 +25,7 @@
   $visibleFields = array();
   foreach(explode(',', $showFields) as $field)
   {
-      if(strpos(",{$config->user->customBatchCreateFields},", $field) === false) continue;
+      if(strpos(",{$config->user->customBatchCreateFields},", ",{$field},") === false) continue;
       if($field) $visibleFields[$field] = '';
   }
   $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index 443a45d4c8..a8442d65d2 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -24,7 +24,7 @@
   $visibleFields = array();
   foreach(explode(',', $showFields) as $field)
   {
-      if(strpos(",{$config->user->customBatchEditFields},", $field) === false) continue;
+      if(strpos(",{$config->user->customBatchEditFields},", ",{$field},") === false) continue;
       if($field)$visibleFields[$field] = '';
   }
   $minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index 48960f185b..9b8a4703ee 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -96,7 +96,7 @@
             <?php endforeach;?>
             <?php endif;?>
             <dt><?php echo $lang->user->address;?></dt>
-            <dd><?php echo $user->address;?></dd>
+            <dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
             <dt><?php echo $lang->user->zipcode;?></dt>
             <dd><?php echo $user->zipcode;?></dd>
           </dl>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 0e88117d6e..95b691fcea 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -39,11 +39,11 @@
           <th class='w-pri'>   <?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>
         </tr>
       </thead>
       <tbody>
diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php
index 51c73c8d4f..6dd1c87b56 100644
--- a/module/webhook/view/log.html.php
+++ b/module/webhook/view/log.html.php
@@ -21,7 +21,7 @@
     <div class='btn-toolbar pull-right'>
       <div class='btn-group'>
         <div class='btn-group' id='createActionMenu'>
-          <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary'");?>
+          <?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary iframe'", '', true);?>
         </div>
       </div>
     </div>
diff --git a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
index 70eb7b4657..5ca8714770 100644
--- a/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/module/chat/ext/lang/en/xuanxuan.php
@@ -1,5 +1,5 @@
 <?php
-$lang->chat->common          = 'Xuanxuan';
+$lang->chat->common          = 'Desktop';
 $lang->chat->turnon          = 'On';
 $lang->chat->help            = 'Help';
 $lang->chat->settings        = 'Settings';