diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 0ff9c4c3ac..b4553f34da 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -1,5 +1,11 @@
 $(function()
 {
+    var blockTitle = '';
+    $(document).on('change', '#blockParams #paramstype', function()
+    {
+        $('#blockParams').find('#title').val(blockTitle + ' - ' + $(this).find('option:selected').html());
+    });
+
     var $form = $('#blockAdminForm');
     $form.find('.chosen').chosen();
 
@@ -16,6 +22,9 @@ $(function()
         $form.addClass('form-inited');
         $blockParams.find('input:first').focus();
         if($blockParams.find('#actionLink').size() > 0) $form.attr('action', $blockParams.find('#actionLink').val());
+
+        blockTitle = $blockParams.find('#title').val();
+        if($('#blockParams #paramstype').length > 0) $blockParams.find('#title').val(blockTitle + ' - ' + $('#blockParams #paramstype').find('option:selected').html());
     };
 
     // 获取 html 和 rss 区块参数
@@ -29,10 +38,7 @@ $(function()
         $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type), function(data)
         {
             updateParams(data);
-            if (type === 'welcome')
-            {
-                $blockParams.find('#title').closest('.form-group').hide();
-            }
+            if(type === 'welcome') $blockParams.find('#title').closest('.form-group').hide();
         });
     };
 
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index f7bd58480b..d2baca0ef0 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -247,5 +247,3 @@ $(function()
         refreshBlock($(this).closest('.panel'));
     });
 });
-
-
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 150463119f..77625497f9 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -55,7 +55,7 @@ $lang->block->editBlock          = '编辑区块';
 $lang->block->ordersSaved        = '排序已保存';
 $lang->block->confirmRemoveBlock = '确定移除区块吗？';
 $lang->block->noticeNewBlock     = '10.0版本以后各个视图主页提供了全新的视图，您要启用新的视图布局吗？';
-$lang->block->confirmReset       = '是否恢复默认布局';
+$lang->block->confirmReset       = '是否恢复默认布局？';
 $lang->block->closeForever       = '永久关闭';
 $lang->block->confirmClose       = '确定永久关闭该区块吗？关闭后所有人都将无法使用该区块，可以在后台自定义中打开。';
 $lang->block->remove             = '移除';
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 45f488d98d..79fc84af9b 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -204,6 +204,8 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
           {
               if($value->show)
               {
+                  if($this->app->getClientLang() == 'en' and $value->id == 'severity') $value->name = 'Severity';
+                  if($this->app->getClientLang() == 'en' and $value->id == 'pri')      $value->name = 'Priority';
                   $this->datatable->printHead($value, $orderBy, $vars);
                   $columns ++;
               }
diff --git a/module/common/model.php b/module/common/model.php
index a6331566c8..00855afdf1 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -254,12 +254,12 @@ class commonModel extends model
             if(!$isGuest)
             {
                 echo '<li class="user-profile-item">';
-                echo "<a href='". helper::createLink('my', 'profile', '', '', true) . "' class='iframe" . (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role]) ? '' : ' no-role') . "' data-width='600'>";
+                echo "<a href='". helper::createLink('my', 'profile') . (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role]) ? '' : ' no-role') . "'>";
                 echo "<div class='avatar avatar bg-secondary avatar-circle'>" . strtoupper($app->user->account{0}) . "</div>\n";
                 echo '<div class="user-profile-name">' . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</div>';
                 if(isset($lang->user->roleList[$app->user->role])) echo '<div class="user-profile-role">' . $lang->user->roleList[$app->user->role] . '</div>';
                 echo '</a></li><li class="divider"></li>';
-                echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
+                echo '<li>' . html::a(helper::createLink('my', 'profile'), $lang->profile) . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), $lang->changePassword, '', "class='iframe' data-width='500'") . '</li>';
 
                 echo "<li class='divider'></li>";
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 501318986a..f8d3a82ba0 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -24,8 +24,8 @@
           <?php $panelTitle = zget($lang->doclib->tabList, $type);?>
           <i class="icon icon-folder-open-o text-muted"></i> <?php echo $panelTitle;?>
           <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
+            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
           </div>
         </div>
       </div>
diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php
index 668d922d3c..c6091df598 100644
--- a/module/doc/view/alllibsbylist.html.php
+++ b/module/doc/view/alllibsbylist.html.php
@@ -5,8 +5,8 @@
         <?php $panelTitle = zget($lang->doclib->tabList, $type);?>
         <i class="icon icon-folder-open-o text-muted"></i> <?php echo $panelTitle;?>
         <div class="btn-group">
-          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
+          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
         </div>
       </div>
     </div>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index db1ae3decb..823dca830c 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -39,8 +39,8 @@ var browseType = '<?php echo $browseType;?>';
         </div>
         <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
+            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
           </div>
           <?php if($libID):?>
           <div class="dropdown">
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index fcb2ec714a..face156077 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -13,8 +13,8 @@
         </div>
         <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
+            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
           </div>
           <?php if($libID):?>
           <div class="dropdown">
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 11532ab067..268cd39d23 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -28,8 +28,8 @@
         <div class="panel-title font-normal">
           <i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
           <div class="btn-group">
-            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
             <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
+            <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
           </div>
         </div>
       </div>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index ced7a170df..01cda19c14 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -5,8 +5,8 @@
       <div class="panel-title font-normal">
         <i class="icon icon-folder-open-o text-muted"></i> <?php echo $object->name;?>
         <div class="btn-group">
-          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
+          <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
         </div>
       </div>
     </div>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 105e939abf..aa0d23b3b0 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -41,8 +41,8 @@
             </form>
           </div>
           <div class="btn-group">
-            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '',  "title={$lang->doc->browseTypeList['list']} class='btn btn-icon" . ($viewType == 'list' ? ' text-primary' : '') . "'");?>
             <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon" . ($viewType != 'list' ? ' text-primary' : '') . "'");?>
+            <?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '',  "title={$lang->doc->browseTypeList['list']} class='btn btn-icon" . ($viewType == 'list' ? ' text-primary' : '') . "'");?>
           </div>
         </nav>
       </div>
@@ -77,8 +77,8 @@
                 <td class="text-center"><?php echo isset($file->addedDate) ? substr($file->addedDate, 0, 10) : '';?></td>
                 <td class="c-actions">
                   <?php
-                  common::printLink('file', 'download', "fileID=$file->id", $lang->doc->download, "data-toggle='modal'", '', true, false, $file);
-                  common::printLink('file', 'delete',   "fileID=$file->id", $lang->delete, 'hiddenwin', '', true, false, $file);
+                  common::printLink('file', 'download', "fileID=$file->id", '<i class="icon-import"></i>', "data-toggle='modal'", "class='btn' title={$lang->doc->download}", true, false, $file);
+                  common::printLink('file', 'delete',   "fileID=$file->id", '<i class="icon-trash"></i>', 'hiddenwin', "class='btn' title={$lang->delete}", true, false, $file);
                   ?>
                 </td>
               </tr>
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 13e5817b86..bb6f0387f7 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -42,8 +42,8 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class='w-60px'>      <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
-          <th class='w-50px'>      <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+          <th class='w-60px' title='<?php echo $lang->bug->severity;?>'> <?php common::printOrderLink('severity',   $orderBy, $vars, $lang->bug->severityAB);?></th>
+          <th class='w-50px' title='<?php echo $lang->bug->pri;?>'> <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
           <th class='w-type'>      <?php common::printOrderLink('type',       $orderBy, $vars, $lang->typeAB);?></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>
diff --git a/module/product/css/common.css b/module/product/css/common.css
index c3e6c23e1c..77dc41ccce 100644
--- a/module/product/css/common.css
+++ b/module/product/css/common.css
@@ -1,2 +1,3 @@
 #whitelistBox .checkbox-primary, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
 .c-pri {overflow:hidden;}
+#mainMenu .btn-toolbar .dropdown-menu li a.btn{text-align:left;}
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 2d5737f69f..35df777a3c 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -1,6 +1,7 @@
 $(function()
 {
     if($('#storyList thead th.c-title').width() < 150) $('#storyList thead th.c-title').width(150);
+    setTimeout(function(){fixFeatureBar();}, 500);
 
     // Fix state dropdown menu position
     $('.c-stage > .dropdown').each(function()
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 74867dda82..69c80e68a0 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 $lang->product->common      = $lang->productCommon;
-$lang->product->index       = $lang->productCommon . 'Home';
+$lang->product->index       = $lang->productCommon . ' Home';
 $lang->product->browse      = 'Story';
 $lang->product->dynamic     = 'Dynamics';
 $lang->product->view        = 'Overview';
@@ -127,8 +127,9 @@ $lang->product->noMatched      = '"%s" cannot be found.' . $lang->productCommon;
 $lang->product->featureBar['browse']['allstory']     = $lang->product->allStory;
 $lang->product->featureBar['browse']['unclosed']     = $lang->product->unclosed;
 $lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
-$lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
 $lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
+$lang->product->featureBar['browse']['openedbyme']   = $lang->product->openedByMe;
+
 $lang->product->featureBar['browse']['draftstory']   = $lang->product->draftStory;
 $lang->product->featureBar['browse']['more']         = $lang->more;
 
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 2eff935556..756d941de1 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -46,7 +46,7 @@
                     $moreLabel       = "<span class='text'>{$lang->product->moreSelects[$storyBrowseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
                     $moreLabelActive = 'btn-active-text';
                 }
-                echo '<div class="btn-group">';
+                echo '<div class="btn-group" id="more">';
                 echo html::a('javascript:;', $moreLabel . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link $moreLabelActive'");
                 echo "<ul class='dropdown-menu'>";
                 foreach($lang->product->moreSelects as $key => $value)
diff --git a/module/project/js/task.js b/module/project/js/task.js
index 9699ef1936..f74c7c99d0 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -1,6 +1,7 @@
 $(function()
 {
     if($('#taskList thead th.c-name').width() < 150) $('#taskList thead th.c-name').width(150);
+    setTimeout(function(){fixFeatureBar();}, 500);
 });
 
 $('#module' + moduleID).closest('li').addClass('active');
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index e64ec6dd8f..83fce9a773 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -88,7 +88,7 @@ js::set('browseType', $browseType);
         }
         elseif($menuType == 'status')
         {
-            echo "<div class='btn-group'>";
+            echo "<div class='btn-group' id='more'>";
             $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
             $current        = $menuItem->text;
             $active         = '';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 34b8bac0c1..beab14568d 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -46,7 +46,7 @@ $lang->story->batchChangeBranch = "Batch Change Branch";
 $lang->story->batchChangeStage  = "Batch Change Phase";
 $lang->story->batchAssignTo     = "Batch Assign";
 $lang->story->batchChangeModule = "Batch Change Module";
-$lang->story->viewAll           = "All Stories";
+$lang->story->viewAll           = "See all";
 
 $lang->story->common         = 'Story';
 $lang->story->id             = 'ID';
@@ -96,7 +96,7 @@ $lang->story->newStory       = 'Continue adding';
 $lang->story->colorTag       = 'Color';
 $lang->story->files          = 'Files';
 $lang->story->copy           = "Copy Story";
-$lang->story->total          = "Total";
+$lang->story->total          = "Total Stories";
 $lang->story->allStories     = 'All Stories';
 $lang->story->unclosed       = 'Unclosed';
 $lang->story->deleted        = 'Deleted';
@@ -227,7 +227,7 @@ $lang->story->action->unlinkchildstory    = array('main' => '$date, unlinked by
 $lang->story->report = new stdclass();
 $lang->story->report->common = 'Report';
 $lang->story->report->select = 'Select Report Type';
-$lang->story->report->create = 'Generate Report';
+$lang->story->report->create = 'Create Report';
 $lang->story->report->value  = 'No. of Reports';
 
 $lang->story->report->charts['storysPerProduct']        = 'Stories of ' . $lang->productCommon;
@@ -269,8 +269,8 @@ $lang->story->report->storysPerPlan->item         = 'Plan';
 $lang->story->report->storysPerStatus->item       = 'Status';
 $lang->story->report->storysPerStage->item        = 'Phase';
 $lang->story->report->storysPerPri->item          = 'Priority';
-$lang->story->report->storysPerOpenedBy->item     = 'Account';
-$lang->story->report->storysPerAssignedTo->item   = 'User';
+$lang->story->report->storysPerOpenedBy->item     = 'Opened By';
+$lang->story->report->storysPerAssignedTo->item   = 'AssignedTo';
 $lang->story->report->storysPerClosedReason->item = 'Reason';
 $lang->story->report->storysPerEstimate->item     = 'Estimates';
 $lang->story->report->storysPerChange->item       = 'Change';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index ae2bedf020..5350d76d80 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -269,8 +269,8 @@ $lang->story->report->storysPerPlan->item         = '计划';
 $lang->story->report->storysPerStatus->item       = '状态';
 $lang->story->report->storysPerStage->item        = '阶段';
 $lang->story->report->storysPerPri->item          = '优先级';
-$lang->story->report->storysPerOpenedBy->item     = '用户';
-$lang->story->report->storysPerAssignedTo->item   = '用户';
+$lang->story->report->storysPerOpenedBy->item     = '由谁创建';
+$lang->story->report->storysPerAssignedTo->item   = '指派给';
 $lang->story->report->storysPerClosedReason->item = '原因';
 $lang->story->report->storysPerEstimate->item     = '预计工时';
 $lang->story->report->storysPerChange->item       = '变更次数';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index bfad500d94..dafd657c95 100644
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -233,7 +233,7 @@ $lang->task->report->finishedTasksPerDay  = new stdclass();
 
 $lang->task->report->tasksPerProject->item      = $lang->projectCommon;
 $lang->task->report->tasksPerModule->item       = 'Module';
-$lang->task->report->tasksPerAssignedTo->item   = 'Account';
+$lang->task->report->tasksPerAssignedTo->item   = 'AssignedTo';
 $lang->task->report->tasksPerType->item         = 'Type';
 $lang->task->report->tasksPerPri->item          = 'Priority';
 $lang->task->report->tasksPerStatus->item       = 'Status';
@@ -241,7 +241,7 @@ $lang->task->report->tasksPerDeadline->item     = 'Date';
 $lang->task->report->tasksPerEstimate->item     = 'Estimates';
 $lang->task->report->tasksPerLeft->item         = 'Man-hours Left';
 $lang->task->report->tasksPerConsumed->item     = 'Man-hours Cost';
-$lang->task->report->tasksPerFinishedBy->item   = 'User';
+$lang->task->report->tasksPerFinishedBy->item   = 'FinishedBy';
 $lang->task->report->tasksPerClosedReason->item = 'Reason';
 $lang->task->report->finishedTasksPerDay->item  = 'Date';
 
diff --git a/module/user/control.php b/module/user/control.php
index 1e4dd2f316..2f2decd893 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -349,13 +349,14 @@ class user extends control
 
         $user = $this->user->getById($account);
 
-        $this->view->title      = "USER #$user->id $user->account/" . $this->lang->user->profile;
-        $this->view->position[] = $this->lang->user->common;
-        $this->view->position[] = $this->lang->user->profile;
-        $this->view->account    = $account;
-        $this->view->user       = $user;
-        $this->view->groups     = $this->loadModel('group')->getByAccount($account);
-        $this->view->deptPath   = $this->dept->getParents($user->dept);
+        $this->view->title        = "USER #$user->id $user->account/" . $this->lang->user->profile;
+        $this->view->position[]   = $this->lang->user->common;
+        $this->view->position[]   = $this->lang->user->profile;
+        $this->view->account      = $account;
+        $this->view->user         = $user;
+        $this->view->groups       = $this->loadModel('group')->getByAccount($account);
+        $this->view->deptPath     = $this->dept->getParents($user->dept);
+        $this->view->personalData = $this->user->getPersonalData($user->account);
 
         $this->display();
     }
diff --git a/module/user/css/profile.css b/module/user/css/profile.css
index 9015003067..454af78db9 100644
--- a/module/user/css/profile.css
+++ b/module/user/css/profile.css
@@ -1,2 +1,10 @@
-#mainContent{margin: 0px auto;}
-#mainContent .actions{float: right;}
+.col-6{width:50% !important;}
+.cell{height:450px;}
+.main-header{margin-bottom:20px;}
+.dl-horizontal dt{color:#999; font-weight:normal; padding:5px 0px;}
+.dl-horizontal dd{padding:5px 0px;}
+.divider{border-left:1px solid #e5e5e5;}
+
+.tiles{padding-top:15px;}
+.tile{margin-bottom:30px; text-align:left !important; padding-left:60px;}
+.tile-title{color:#999; padding-bottom:5px !important;}
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index c13c3e3486..3e43ec29dd 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -50,7 +50,7 @@
         <caption class='text-left text-muted'><?php echo $lang->user->accountInfo;?></caption>
         <?php $thClass = ($app->getClientLang() == 'en') ? 'w-130px' : 'w-90px';?>
         <tr>
-          <th class='w-100px'><?php echo $lang->user->account;?></th>
+          <th class='w-140px'><?php echo $lang->user->account;?></th>
           <td class='w-p40'><?php echo html::input('account', $user->account, "class='form-control'");?></td>
           <th class='<?php echo $thClass?>'><?php echo $lang->user->email;?></th>
           <td>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index c5bba5ba88..ba97192635 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -13,113 +13,108 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='mainContent' class='main-content mw-600px'>
-  <div class='main-header'>
-    <h2>
-        <span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']);?></span>
-        <strong><?php echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
-        <?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?>
-    </h2>
-    <div class='actions'>
-      <?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
+<div id='mainContent' class='main-row'>
+  <div class='main-col col-6'>
+    <div class='cell'>
+      <div class='main-header'>
+        <h2><?php echo $lang->user->legendBasic;?></h2>
+        <div class='actions pull-right'>
+          <?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
+        </div>
+      </div>
+      <div class='row'>
+        <div class='col-md-6'>
+          <dl class='dl-horizontal'>
+            <dt><?php echo $lang->user->account;?></dt>
+            <dd><?php echo $user->account;?></dd>
+            <dt><?php echo $lang->user->realname;?></dt>
+            <dd><?php echo $user->realname;?></dd>
+            <dt><?php echo $lang->user->dept;?></dt>
+            <dd>
+            <?php
+            if(empty($deptPath))
+            {
+                echo "/";
+            }
+            else
+            {
+                foreach($deptPath as $key => $dept)
+                {
+                    if($dept->name) echo $dept->name;
+                    if(isset($deptPath[$key + 1])) echo $lang->arrow;
+                }
+            }
+            ?>
+            </dd>
+            <dt><?php echo $lang->user->role;?></dt>
+            <dd><?php echo $lang->user->roleList[$user->role];?></dd>
+            <dt><?php echo $lang->group->priv;?></dt>
+            <dd><?php foreach($groups as $group) echo $group->name . ' '; ?></dd>
+            <dt><?php echo $lang->user->join;?></dt>
+            <dd><?php echo formatTime($user->join);?></dd>
+            <dt><?php echo $lang->user->visits;?></dt>
+            <dd><?php echo $user->visits;?></dd>
+            <dt><?php echo $lang->user->ip;?></dt>
+            <dd><?php echo $user->ip;?></dd>
+            <dt><?php echo $lang->user->last;?></dt>
+            <dd><?php echo $user->last;?></dd>
+            <?php if($user->ranzhi):?>
+            <dt><?php echo $lang->user->ranzhi;?></dt>
+            <dd>
+              <?php echo $user->ranzhi . ' ';?>
+              <?php if(common::hasPriv('my', 'unbind')) echo html::a($this->createLink('my', 'unbind'), "<i class='icon-unlink'></i>", 'hiddenwin', "class='bin-icon' title='{$lang->user->unbind}'");?>
+            </dd>
+            <?php endif;?>
+          </dl>
+        </div>
+        <div class='col-md-6 divider'>
+          <dl class='dl-horizontal'>
+            <dt><?php echo $lang->user->commiter;?></dt>
+            <dd><?php echo $user->commiter;?></dd>
+            <dt><?php echo $lang->user->email;?></dt>
+            <dd><?php echo $user->email;?></dd>
+            <?php foreach(explode(',', $config->user->contactField) as $field):?>
+            <dt><?php echo $lang->user->$field;?></dt>
+            <dd>
+              <?php
+              if($field == 'skype' and $user->$field)
+              {
+                  echo html::a("callto://$user->skype", $user->skype);
+              }
+              elseif($field == 'qq' and $user->$field)
+              {
+                  echo html::a("tencent://message/?uin=$user->qq", $user->qq);
+              }
+              else
+              {
+                  echo $user->$field;
+              }
+              ?>
+            </dd>
+            <?php endforeach;?>
+            <dt><?php echo $lang->user->address;?></dt>
+            <dd><?php echo $user->address;?></dd>
+            <dt><?php echo $lang->user->zipcode;?></dt>
+            <dd><?php echo $user->zipcode;?></dd>
+          </dl>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class='side-col col-6'>
+    <div class='cell'>
+      <div class='main-header'>
+        <h2><?php echo $lang->user->legendContribution;?></h2>
+      </div>
+      <div class='row tiles'>
+        <?php foreach($lang->user->personalData as $key => $title):?>
+        <div class='col-4 col tile'>
+          <div class='tile-title'><?php echo $title;?></div>
+          <div class='tile-amount'><?php echo zget($personalData, $key, 0);?></div>
+        </div>
+        <?php endforeach;?>
+      </div>
     </div>
   </div>
-
-  <table class='table table-borderless table-data'>
-    <tr>
-      <th class='w-100px'><?php echo $lang->user->dept;?></th>
-      <td>
-      <?php
-      if(empty($deptPath))
-      {
-          echo "/";
-      }
-      else
-      {
-          foreach($deptPath as $key => $dept)
-          {
-              if($dept->name) echo $dept->name;
-              if(isset($deptPath[$key + 1])) echo $lang->arrow;
-          }
-      }
-       ?>
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->account;?></th>
-      <td><?php echo $user->account;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->realname;?></th>
-      <td><?php echo $user->realname;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->group->priv;?></th>
-      <td><?php foreach($groups as $group) echo $group->name . ' '; ?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->role;?></th>
-      <td><?php echo $lang->user->roleList[$user->role];?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->join;?></th>
-      <td><?php echo formatTime($user->join);?></td>
-    </tr> 
-    <tr>
-      <th><?php echo $lang->user->commiter;?></th>
-      <td><?php echo $user->commiter;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->email;?></th>
-      <td><?php echo $user->email;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->visits;?></th>
-      <td><?php echo $user->visits;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->ip;?></th>
-      <td><?php echo $user->ip;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->last;?></th>
-      <td><?php echo $user->last;?></td>
-    </tr>
-    <?php foreach(explode(',', $config->user->contactField) as $field):?>
-    <tr>
-      <th><?php echo $lang->user->$field;?></th>
-      <td>
-        <?php
-        if($field == 'skype' and $user->$field)
-        {
-            echo html::a("callto://$user->skype", $user->skype);
-        }
-        elseif($field == 'qq' and $user->$field)
-        {
-            echo html::a("tencent://message/?uin=$user->qq", $user->qq);
-        }
-        else
-        {
-            echo $user->$field;
-        }
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    <tr>
-      <th><?php echo $lang->user->address;?></th>
-      <td><?php echo $user->address;?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->zipcode;?></th>
-      <td><?php echo $user->zipcode;?></td>
-    </tr>
-    <?php if($user->ranzhi):?>
-    <tr>
-      <th><?php echo $lang->user->ranzhi;?></th>
-      <td><?php echo $user->ranzhi;?></td>
-    </tr>
-    <?php endif;?>
-  </table>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/www/theme/lang/en.css b/www/theme/lang/en.css
index e69de29bb2..b1d07a2c71 100644
--- a/www/theme/lang/en.css
+++ b/www/theme/lang/en.css
@@ -0,0 +1 @@
+.btn-toolbar>.btn, .btn-toolbar>.btn-group, .btn-toolbar>.dropdown {margin-right: 5px !important;}