diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index af813d149d..669396d19b 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -14,11 +14,7 @@ $lang->custom->module     = 'Module';
 $lang->custom->section    = 'Section';
 $lang->custom->lang       = 'Language';
 $lang->custom->setPublic  = 'Set Public';
-<<<<<<< HEAD
 $lang->custom->required   = 'Required Fields';
-=======
-$lang->custom->required   = 'Form';
->>>>>>> 10e0c46c717357a938473ad63b4fce485c870ebd
 $lang->custom->score      = 'Point';
 $lang->custom->timezone   = 'Timezone';
 $lang->custom->scoreReset = 'Reset Point';
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index aff62821fd..9a834819e6 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -154,7 +154,7 @@ $lang->doc->orderLib = 'Rank Settings';
 $lang->doc->customShowLibs = 'Display Settings';
 $lang->doc->customShowLibsList['zero']     = 'Display Empty Library';
 $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
-$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->productCommon}s Only";
+$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->projectCommon}s Only";
 
 $lang->doc->confirmDelete      = "Do you want to delete this document?";
 $lang->doc->confirmDeleteLib   = "Do you want to delete this document library?";
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 07f96374d9..4914059820 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -12,15 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php if($app->getClientLang() == 'en'):?>
-<style>
-.main-actions .btn-toolbar .btn { padding-right: 5px !important; padding-left: 5px !important;}
-.main-actions .btn-toolbar .divider { margin-right: 5px !important; margin-left: 5px !important;}
-.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;}
-</style>
-<?php endif;?>
 <?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id="mainMenu" class="clearfix">
diff --git a/module/user/control.php b/module/user/control.php
index 2f2decd893..6718ac3213 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -127,6 +127,7 @@ class user extends control
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->type       = $type;
         $this->view->account    = $account;
+        $this->view->user       = $this->user->getById($account);
         $this->view->pager      = $pager;
 
         $this->display();
@@ -244,13 +245,13 @@ class user extends control
         $this->view->tasks      = $this->loadModel('testtask')->getByUser($account, $pager, $sort);
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->account    = $account;
+        $this->view->user       = $this->user->getById($account);
         $this->view->recTotal   = $recTotal;
         $this->view->recPerPage = $recPerPage;
         $this->view->pageID     = $pageID;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
         $this->display();
-
     }
 
     /**
@@ -296,6 +297,7 @@ class user extends control
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->testCase;
         $this->view->position[] = $this->lang->user->testCase;
         $this->view->account    = $account;
+        $this->view->user       = $this->user->getById($account);
         $this->view->cases      = $cases;
         $this->view->users      = $this->user->getPairs('noletter');
         $this->view->tabID      = 'test';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 930f3ccc51..92f9c618ff 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -83,15 +83,15 @@ $lang->user->confirmDeleteTemplate = 'Do you want to delete this template?';
 $lang->user->setPublicTemplate     = 'Set as Public Template';
 
 $lang->user->profile     = 'Profile';
-$lang->user->project     = $lang->projectCommon;
-$lang->user->task        = 'Task';
-$lang->user->bug         = 'Bug';
+$lang->user->project     = $lang->projectCommon . 's';
+$lang->user->task        = 'Tasks';
+$lang->user->bug         = 'Bugs';
 $lang->user->test        = 'QA';
 $lang->user->testTask    = 'Test Request';
 $lang->user->testCase    = 'Test Case';
 $lang->user->schedule    = 'Schedule';
 $lang->user->todo        = 'Todo';
-$lang->user->story       = 'Story';
+$lang->user->story       = 'Stories';
 $lang->user->dynamic     = 'Dynamics';
 
 $lang->user->openedBy    = 'CreatedBy';
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index a320e13a66..4a7524b856 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -17,7 +17,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $app->user->gender) : '';
+      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
       $active = $type == 'assignedTo' ? 'active' : '';
       echo "<li class='$active'>" . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo . $that) . "</li>";
 
@@ -42,7 +42,7 @@
           <th class='w-pri'><?php echo $lang->priAB;?></th>
           <th class='w-type'><?php echo $lang->typeAB;?></th>
           <th><?php echo $lang->bug->title;?></th>
-          <th class='w-user'><?php echo $lang->openedByAB;?></th>
+          <th class='w-90px'><?php echo $lang->openedByAB;?></th>
           <th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
           <th class='w-resolution'><?php echo $lang->bug->resolutionAB;?></th>
         </tr>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index e6cdca373a..c4b30865c3 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -17,7 +17,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $app->user->gender) : '';
+      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
       $active = $type == 'assignedTo' ? 'active' : '';
       echo "<li class='$active'>" . html::a(inlink('story', "account=$account&type=assignedTo"),  $lang->user->assignedTo . $that) . "</li>";
 
@@ -42,8 +42,8 @@
           <th class='w-200px'> <?php echo $lang->story->product;?></th>
           <th>                 <?php echo $lang->story->title;?></th>
           <th class='w-150px'> <?php echo $lang->story->plan;?></th>
-          <th class='w-user'>  <?php echo $lang->openedByAB;?></th>
-          <th class='w-hour'>  <?php echo $lang->story->estimateAB;?></th>
+          <th class='w-90px'>  <?php echo $lang->openedByAB;?></th>
+          <th class='w-60px'>  <?php echo $lang->story->estimateAB;?></th>
           <th class='w-status'><?php echo $lang->statusAB;?></th>
           <th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
         </tr>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 9e892c651e..488f8a5ff8 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -17,7 +17,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $app->user->gender) : '';
+      $that   = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
       $active = $type == 'assignedTo' ? 'active' : '';
       echo "<li class='$active'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo . $that) . "</li>";
 
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 64e6cbdfa8..0e88117d6e 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -16,7 +16,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      $that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $app->user->gender) : '';
+      $that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
       echo "<li id='testtaskTab'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him . $that) . "</li>";
     
       $active = $type == 'case2Him' ? 'active' : '';
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index 14258eeaf4..7301c08e8e 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -16,7 +16,7 @@
   <nav id='contentNav'>
     <ul class='nav nav-default'>
       <?php
-      $that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $app->user->gender) : '';
+      $that = $app->getClientLang() == 'en' ? zget($lang->user->thirdPerson, $user->gender) : '';
       echo "<li class='active'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him . $that) . "</li>";
       echo "<li>"  . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"),  $lang->user->case2Him . $that) . "</li>";
       echo "<li>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"),  $lang->user->caseByHim . $that) . "</li>";
@@ -28,14 +28,14 @@
     <table class='table has-sort-head'>
       <?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
       <thead>
-        <tr class='colhead'>
-          <th class='w-id'>  <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
-          <th>               <?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
-          <th>               <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
-          <th>               <?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
+        <tr>
+          <th class='w-id'>   <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
+          <th>                <?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
+          <th>                <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
+          <th>                <?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
           <th class='w-100px'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
           <th class='w-100px'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
-          <th class='w-80px'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='w-80px'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
         </tr>
       </thead>
       <tbody>