diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 6395e955ef..dd13df6264 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -48,7 +48,7 @@
         <tr class='text-center'>
           <td><?php echo sprintf('%03d', $story->id);?></td>
           <td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri]?>'><?php echo $lang->story->priList[$story->pri];?></span></td>
-          <td class='a-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
+          <td class='text-left nobr'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
           <td><?php echo $users[$story->openedBy];?></td>
           <td><?php echo $story->estimate;?></td>
           <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
@@ -72,7 +72,7 @@
         <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
         <tr class='text-center'>
           <td><?php echo sprintf('%03d', $bug->id);?></td>
-          <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+          <td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
           <td><?php echo $lang->bug->statusList[$bug->status];?></td>
           <td><?php echo $users[$bug->openedBy];?></td>
           <td><?php echo substr($bug->openedDate, 5, 11)?></td>
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 34eca08189..ffb8cc670e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -423,6 +423,7 @@ $lang->icons['testtask']= 'check';
 $lang->icons['group']   = 'group';
 $lang->icons['team']    = 'group';
 $lang->icons['company'] = 'building';
+$lang->icons['user']    = 'user';
 $lang->icons['dept']    = 'sitemap';
 $lang->icons['usecase'] = 'usecase';
 $lang->icons['testcase']= 'smile';
diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css
index 0aab5245ba..7c1b9285d9 100644
--- a/module/group/css/managepriv.css
+++ b/module/group/css/managepriv.css
@@ -1 +1,3 @@
 .form-condensed select.form-control {height:250px}
+#featurebar > .nav > li > a > .icon-home {display: none}
+.group-item {display:block; width:200px; float:left; font-size: 14px}
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index bd12cc917f..0e0e784bbb 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -12,29 +12,33 @@
 ?>
 <form class='form-condensed' method='post' target='hiddenwin'>
   <div id='featurebar'>
-    <?php $params = "type=byGroup&param=$groupID&menu=%s&version=$version";?>
-    <span <?php echo empty($menu) ? "class='active'" : ""?>>
-      <?php echo html::a(inlink('managePriv', sprintf($params, '')), $lang->group->all)?>
-    </span>
+    <div class='heading'><i class='icon-lock'></i></div>
+    <ul class='nav'>
+      <?php $params = "type=byGroup&param=$groupID&menu=%s&version=$version";?>
+      <li <?php echo empty($menu) ? "class='active'" : ""?>>
+        <?php echo html::a(inlink('managePriv', sprintf($params, '')), $lang->group->all)?>
+      </li>
 
-    <?php foreach($lang->menu as $module => $title):?>
-    <span <?php echo $menu == $module ? "class='active'" : ""?>>
-      <?php echo html::a(inlink('managePriv', sprintf($params, $module)), substr($title, 0, strpos($title, '|')))?>
-    </span>
-    <?php endforeach;?>
+      <?php foreach($lang->menu as $module => $title):?>
+      <li <?php echo $menu == $module ? "class='active'" : ""?>>
+        <?php echo html::a(inlink('managePriv', sprintf($params, $module)), substr($title, 0, strpos($title, '|')))?>
+      </li>
+      <?php endforeach;?>
 
-    <span <?php echo $menu == 'other' ? "class='active'" : "";?>>
-      <?php echo html::a(inlink('managePriv', sprintf($params, 'other')), $lang->group->other);?>
-    </span>
+      <li <?php echo $menu == 'other' ? "class='active'" : "";?>>
+        <?php echo html::a(inlink('managePriv', sprintf($params, 'other')), $lang->group->other);?>
+      </li>
 
-    <span><?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value)");?></span>
+      <li><?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control'");?></li>
+    </ul>
   </div>
-
-  <table class='table-1 a-left'> 
-    <tr class='colhead'>
-      <th><?php echo $lang->group->module;?></th>
-      <th><?php echo $lang->group->method;?></th>
-    </tr>  
+  <table class='table table-hover table-striped table-bordered table-form'> 
+    <thead>
+      <tr>
+        <th><?php echo $lang->group->module;?></th>
+        <th><?php echo $lang->group->method;?></th>
+      </tr>
+    </thead>
     <?php foreach($lang->resource as $moduleName => $moduleActions):?>
     <?php if(!$this->group->checkMenuModule($menu, $moduleName)) continue;?>
     <?php
@@ -53,23 +57,22 @@
         if(!$hasMethod) continue;
     }
     ?>
-    <tr class='f-14px <?php echo cycle('even, bg-gray');?>'>
-      <th class='a-right w-150px'><?php echo $this->lang->$moduleName->common;?><?php echo html::selectAll($moduleName, 'checkbox')?></td>
+    <tr class='<?php echo cycle('even, bg-gray');?>'>
+      <th class='text-right w-150px'><?php echo $this->lang->$moduleName->common;?><?php echo html::selectAll($moduleName, 'checkbox')?></th>
       <td id='<?php echo $moduleName;?>' class='pv-10px'>
         <?php $i = 1;?>
         <?php foreach($moduleActions as $action => $actionLabel):?>
         <?php if(!empty($version) and strpos($changelogs, ",$moduleName-$actionLabel,") === false) continue;?>
-        <div class='w-p20 f-left'>
+        <div class='group-item'>
           <input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked";?> />
           <span class='priv' id="<?php echo $moduleName . '-' . $actionLabel;?>"><?php echo $lang->$moduleName->$actionLabel;?></span>
         </div>
-        <?php if(($i %  4) == 0) echo "<div class='c-both'></div>"; $i ++;?>
         <?php endforeach;?>
       </td>
     </tr>
     <?php endforeach;?>
     <tr>
-      <th><?php echo $lang->selectAll . html::selectAll('', 'checkbox')?></th>
+      <th class='text-right'><?php echo $lang->selectAll . html::selectAll('', 'checkbox')?></th>
       <td>
         <?php 
         echo html::submitButton($lang->save, "onclick='setNoChecked()'");
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 6551805924..4c47d51cc9 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -42,7 +42,7 @@
         </td>
         <td><span class='<?php echo 'pri' . $bug->pri;?>'><?php echo $bug->pri?></span></td>
         <td><?php echo $bug->planTitle;?></td>
-        <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+        <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
         <td><?php echo $users[$bug->openedBy];?></td>
         <td><?php echo $users[$bug->assignedTo];?></td>
         <td><?php echo $lang->bug->statusList[$bug->status];?></td>
@@ -84,7 +84,7 @@
           <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?>
         </td>
         <td><span class='<?php echo 'pri' . $bug->pri;?>'><?php echo $bug->pri?></span></td>
-        <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+        <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
         <td><?php echo $users[$bug->openedBy];?></td>
         <td><?php echo $users[$bug->assignedTo];?></td>
         <td><?php echo $lang->bug->statusList[$bug->status];?></td>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index f15db20b47..6fd01ed9c0 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -44,7 +44,7 @@
         </td>
         <td><span class='<?php echo 'pri' . $story->pri;?>'><?php echo $story->pri?></span></td>
         <td><?php echo $story->planTitle;?></td>
-        <td class='a-left nobr'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?></td>
+        <td class='text-left nobr'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?></td>
         <td><?php echo $users[$story->openedBy];?></td>
         <td><?php echo $users[$story->assignedTo];?></td>
         <td><?php echo $story->estimate;?></td>
@@ -90,7 +90,7 @@
           <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), sprintf("%03d", $story->id));?>
         </td>
         <td><span class='<?php echo 'pri' . $story->pri;?>'><?php echo $story->pri?></span></td>
-        <td class='a-left nobr'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?></td>
+        <td class='text-left nobr'><?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?></td>
         <td><?php echo $users[$story->openedBy];?></td>
         <td><?php echo $users[$story->assignedTo];?></td>
         <td><?php echo $story->estimate;?></td>
diff --git a/module/project/view/doc.html.php b/module/project/view/doc.html.php
index fdc2b6f016..34c545b36e 100644
--- a/module/project/view/doc.html.php
+++ b/module/project/view/doc.html.php
@@ -42,7 +42,7 @@
       <tr class='text-center'>
         <td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
         <td><?php if(isset($modules[$doc->module]))print($modules[$doc->module]);?></td>
-        <td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
+        <td class='text-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
         <td><?php echo $users[$doc->addedBy];?></td>
         <td><?php echo $doc->addedDate;?></td>
         <td>
diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php
index da32a19477..1425ee7754 100755
--- a/module/project/view/importbug.html.php
+++ b/module/project/view/importbug.html.php
@@ -44,7 +44,7 @@ var browseType = '<?php echo $browseType;?>';
       </td>
       <td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo $lang->bug->severityList[$bug->severity]?></span></td>
       <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo $lang->bug->priList[$bug->pri]?></span></td>
-      <td class='a-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
+      <td class='text-left nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
       <td><?php echo $lang->bug->statusList[$bug->status];?></td>
       <td><?php echo html::select("pri[$bug->id]", $lang->task->priList, 3);?></td>
       <td><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo));?></td>
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index fbe5ab9d07..e1076d33f3 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table-1 fixed tablesorter'>
+  <table class='table tablesorter table-fixed'>
     <caption>
     <?php
     $projects = array(0 => $lang->project->fromproject) + $projects;
@@ -46,12 +46,12 @@
 
       <td><?php echo substr($projects[$task->project], 2);?></td>
       <td><span class='<?php echo 'pri' . $task->pri?>'><?php echo $task->pri;?></span></td>
-      <td class='a-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+      <td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
       <td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
       <td><?php echo $task->left;?></td>
       <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
       <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
-      <td class='a-left nobr'>
+      <td class='text-left nobr'>
         <?php 
         if($task->storyID)
         {
diff --git a/module/release/view/ajaxgetstoriesandbugs.html.php b/module/release/view/ajaxgetstoriesandbugs.html.php
index 9edc20171f..867e407ebb 100644
--- a/module/release/view/ajaxgetstoriesandbugs.html.php
+++ b/module/release/view/ajaxgetstoriesandbugs.html.php
@@ -63,7 +63,7 @@
                   <td class='w-id a-left' id='bug'>
                     <input type='checkbox' name='bugs[]' value="<?php echo $bug->id;?>" <?php if($bug->status == 'closed' or $bug->status == 'resolved') echo "checked"; ?>> <?php echo sprintf('%03d', $bug->id);?>
                   </td>
-                  <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                  <td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                   <td class='w-80px'><?php echo $lang->bug->statusList[$bug->status];?></td>
                 </tr>
                 <?php endforeach;?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 3aeda767fb..1af0cf343c 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -142,7 +142,7 @@
               <?php $bugLink = $this->createLink('bug', 'view', "bugID=$bug->id", '', true);?>
               <tr class='text-center'>
                 <td><?php echo sprintf('%03d', $bug->id);?></td>
-                <td class='a-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
+                <td class='text-left nobr'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
                 <td><?php echo $lang->bug->statusList[$bug->status];?></td>
                 <td><?php echo $users[$bug->openedBy];?></td>
                 <td><?php echo substr($bug->openedDate, 5, 11)?></td>
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 8db81d0bfd..afe37eb89d 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -9,37 +9,40 @@
  * @version     $Id: zh-cn.php 5053 2013-07-06 08:17:37Z wyd621@gmail.com $
  * @link        http://www.zentao.net
  */
-$lang->user->common    = '用户';
-$lang->user->id        = '用户编号';
-$lang->user->company   = '所属公司';
-$lang->user->dept      = '所属部门';
-$lang->user->account   = '用户名';
-$lang->user->password  = '密码';
-$lang->user->password2 = '请重复密码';
-$lang->user->role      = '职位';
-$lang->user->group     = '分组';
-$lang->user->realname  = '真实姓名';
-$lang->user->nickname  = '昵称';
-$lang->user->commiter  = '源代码帐号';
-$lang->user->avatar    = '头像';
-$lang->user->birthyear = '出生年';
-$lang->user->gender    = '性别';
-$lang->user->email     = '邮箱';
-$lang->user->skype     = 'Skype';
-$lang->user->qq        = 'QQ';
-$lang->user->yahoo     = '雅虎通';
-$lang->user->gtalk     = 'GTalk';
-$lang->user->wangwang  = '旺旺';
-$lang->user->mobile    = '手机';
-$lang->user->phone     = '电话';
-$lang->user->address   = '通讯地址';
-$lang->user->zipcode   = '邮编';
-$lang->user->join      = '加入日期';
-$lang->user->visits    = '访问次数';
-$lang->user->ip        = '最后IP';
-$lang->user->last      = '最后登录';
-$lang->user->status    = '状态';
-$lang->user->ditto     = '同上';
+$lang->user->common      = '用户';
+$lang->user->id          = '用户编号';
+$lang->user->company     = '所属公司';
+$lang->user->dept        = '所属部门';
+$lang->user->account     = '用户名';
+$lang->user->password    = '密码';
+$lang->user->password2   = '请重复密码';
+$lang->user->role        = '职位';
+$lang->user->group       = '分组';
+$lang->user->realname    = '真实姓名';
+$lang->user->nickname    = '昵称';
+$lang->user->commiter    = '源代码帐号';
+$lang->user->avatar      = '头像';
+$lang->user->birthyear   = '出生年';
+$lang->user->gender      = '性别';
+$lang->user->email       = '邮箱';
+$lang->user->basicInfo   = '基本信息';
+$lang->user->accountInfo = '帐号信息';
+$lang->user->contactInfo = '联系信息';
+$lang->user->skype       = 'Skype';
+$lang->user->qq          = 'QQ';
+$lang->user->yahoo       = '雅虎通';
+$lang->user->gtalk       = 'GTalk';
+$lang->user->wangwang    = '旺旺';
+$lang->user->mobile      = '手机';
+$lang->user->phone       = '电话';
+$lang->user->address     = '通讯地址';
+$lang->user->zipcode     = '邮编';
+$lang->user->join        = '加入日期';
+$lang->user->visits      = '访问次数';
+$lang->user->ip          = '最后IP';
+$lang->user->last        = '最后登录';
+$lang->user->status      = '状态';
+$lang->user->ditto       = '同上';
 
 $lang->user->index           = "用户视图首页";
 $lang->user->view            = "用户详情";
diff --git a/module/user/model.php b/module/user/model.php
index 5f740b3970..4cd11c3e85 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -42,7 +42,7 @@ class userModel extends model
      */
     public function setUserList($users, $account)
     {
-        return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\"");
+        return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\" class='form-control'");
     }
 
     /**
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 057852abd3..36a929579a 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -13,17 +13,17 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php
-    echo "<span id='assignedToTab'>"  . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</span>";
-    echo "<span id='openedByTab'>"    . html::a(inlink('bug', "account=$account&type=openedBy"),   $lang->user->openedBy)   . "</span>";
-    echo "<span id='resolvedByTab'>"  . html::a(inlink('bug', "account=$account&type=resolvedBy"), $lang->user->resolvedBy) . "</span>";
-    echo "<span id='closedByTab'>"    . html::a(inlink('bug', "account=$account&type=closedBy"),   $lang->user->closedBy)   . "</span>";
+    echo "<li id='assignedToTab'>"  . html::a(inlink('bug', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
+    echo "<li id='openedByTab'>"    . html::a(inlink('bug', "account=$account&type=openedBy"),   $lang->user->openedBy)   . "</li>";
+    echo "<li id='resolvedByTab'>"  . html::a(inlink('bug', "account=$account&type=resolvedBy"), $lang->user->resolvedBy) . "</li>";
+    echo "<li id='closedByTab'>"    . html::a(inlink('bug', "account=$account&type=closedBy"),   $lang->user->closedBy)   . "</li>";
     ?>
-  </div>
+  </ul>
 </div>
-<table class='table-1 tablesorter fixed'>
+<table class='table tablesorter table-fixed'>
   <thead>
   <tr class='colhead'>
     <th class='w-id'><?php echo $lang->idAB;?></th>
@@ -43,7 +43,7 @@
     <td><?php echo $lang->bug->severityList[$bug->severity]?></td>
     <td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo $lang->bug->priList[$bug->pri]?></span></td>
     <td><?php echo $lang->bug->typeList[$bug->type]?></td>
-    <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+    <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
     <td><?php echo $users[$bug->openedBy];?></td>
     <td><?php echo $users[$bug->resolvedBy];?></td>
     <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 7034e3e288..44ab52f910 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -13,21 +13,21 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php 
-    echo "<span id='today'>"      . html::a(inLink('dynamic', "period=today&account=$account"),      $lang->action->dynamic->today)      . '</span>';
-    echo "<span id='yesterday'>"  . html::a(inLink('dynamic', "period=yesterday&account=$account"),  $lang->action->dynamic->yesterday)  . '</span>';
-    echo "<span id='twodaysago'>" . html::a(inLink('dynamic', "period=twodaysago&account=$account"), $lang->action->dynamic->twoDaysAgo) . '</span>';
-    echo "<span id='thisweek'>"   . html::a(inLink('dynamic', "period=thisweek&account=$account"),   $lang->action->dynamic->thisWeek)   . '</span>';
-    echo "<span id='lastweek'>"   . html::a(inLink('dynamic', "period=lastweek&account=$account"),   $lang->action->dynamic->lastWeek)   . '</span>';
-    echo "<span id='thismonth'>"  . html::a(inLink('dynamic', "period=thismonth&account=$account"),  $lang->action->dynamic->thisMonth)  . '</span>';
-    echo "<span id='lastmonth'>"  . html::a(inLink('dynamic', "period=lastmonth&account=$account"),  $lang->action->dynamic->lastMonth)  . '</span>';
-    echo "<span id='all'>"        . html::a(inLink('dynamic', "period=all&account=$account"),        $lang->action->dynamic->all)        . '</span>';
+    echo "<li id='today'>"      . html::a(inLink('dynamic', "period=today&account=$account"),      $lang->action->dynamic->today)      . '</li>';
+    echo "<li id='yesterday'>"  . html::a(inLink('dynamic', "period=yesterday&account=$account"),  $lang->action->dynamic->yesterday)  . '</li>';
+    echo "<li id='twodaysago'>" . html::a(inLink('dynamic', "period=twodaysago&account=$account"), $lang->action->dynamic->twoDaysAgo) . '</li>';
+    echo "<li id='thisweek'>"   . html::a(inLink('dynamic', "period=thisweek&account=$account"),   $lang->action->dynamic->thisWeek)   . '</li>';
+    echo "<li id='lastweek'>"   . html::a(inLink('dynamic', "period=lastweek&account=$account"),   $lang->action->dynamic->lastWeek)   . '</li>';
+    echo "<li id='thismonth'>"  . html::a(inLink('dynamic', "period=thismonth&account=$account"),  $lang->action->dynamic->thisMonth)  . '</li>';
+    echo "<li id='lastmonth'>"  . html::a(inLink('dynamic', "period=lastmonth&account=$account"),  $lang->action->dynamic->lastMonth)  . '</li>';
+    echo "<li id='all'>"        . html::a(inLink('dynamic', "period=all&account=$account"),        $lang->action->dynamic->all)        . '</li>';
     ?>
-  </div>
+  </ul>
 </div>
-<table class='table-1 colored tablesorter fixed'>
+<table class='table tablesorter table-fixed'>
   <thead>
   <tr class='colhead'>
     <th class='w-150px'><?php echo $lang->action->date;?></th>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 3bafd95480..48998e185a 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -12,90 +12,89 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table align='center' class='table-5'> 
-    <caption><?php echo $lang->user->edit;?></caption>
-    <tr>
-      <th><?php echo $lang->user->dept;?></th>
-      <td><?php echo html::select('dept', $depts, $user->dept, "class='form-control'");?>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->account;?></th>
-      <td><?php echo html::input('account', $user->account, "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->realname;?></th>
-      <td><?php echo html::input('realname', $user->realname, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->role;?></th>
-      <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->group->priv;?></th>
-      <td><?php echo html::select('groups[]', $groups, $userGroups, 'size=3 multiple=multiple class=select-3');?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->user->commiter;?></th>
-      <td><?php echo html::input('commiter', $user->commiter, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->email;?></th>
-      <td><?php echo html::input('email', $user->email, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->join;?></th>
-      <td><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->gender;?></th>
-      <td><?php echo html::radio('gender', (array)$lang->user->genderList, $user->gender);?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->password;?></th>
-      <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->password2;?></th>
-      <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
-    </tr>  
-     <tr>
-      <th><?php echo $lang->user->skype;?></th>
-      <td><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->qq;?></th>
-      <td><?php echo html::input('qq', $user->qq, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->yahoo;?></th>
-      <td><?php echo html::input('yahoo', $user->yahoo, "class='form-control'");?></td>
-    </tr>
-     <tr>
-      <th><?php echo $lang->user->gtalk;?></th>
-      <td><?php echo html::input('gtalk', $user->gtalk, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->wangwang;?></th>
-      <td><?php echo html::input('wangwang', $user->wangwang, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->mobile;?></th>
-      <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
-    </tr>
-     <tr>
-      <th><?php echo $lang->user->phone;?></th>
-      <td><?php echo html::input('phone', $user->phone, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->address;?></th>
-      <td><?php echo html::input('address', $user->address, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->user->zipcode;?></th>
-      <td><?php echo html::input('zipcode', $user->zipcode, "class='form-control'");?></td>
-    </tr>
-    <tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
+<div class='container mw-800px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']) . ' #' . $user->id;?></span>
+      <strong><?php if(!common::printLink('user', 'view', "account=$user->account", $user->realname)) echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
+      <small class='text-muted'> <?php echo $lang->user->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
+    <table align='center' class='table table-form'>
+      <caption class='text-left text-muted'><?php echo $lang->user->basicInfo;?></caption>
+      <tr>
+        <th class='w-90px'><?php echo $lang->user->realname;?></th>
+        <td class='w-p40'><?php echo html::input('realname', $user->realname, "class='form-control'");?></td><td></td><td></td>
+      </tr>
+      <tr>
+        <th class='w-90px'><?php echo $lang->user->dept;?></th>
+        <td class='w-p40'><?php echo html::select('dept', $depts, $user->dept, "class='form-control'");?></td>
+        <th><?php echo $lang->user->role;?></th>
+        <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->group->priv;?></th>
+        <td colspan='3'><?php echo html::select('groups[]', $groups, $userGroups, 'size=3 multiple=multiple class="form-control chosen"');?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->join;?></th>
+        <td><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>
+        <th><?php echo $lang->user->gender;?></th>
+        <td><?php echo html::radio('gender', (array)$lang->user->genderList, $user->gender);?></td>
+      </tr>
+    </table>
+    <table align='center' class='table table-form'>
+      <caption class='text-left text-muted'><?php echo $lang->user->accountInfo;?></caption>
+      <tr>
+        <th class='w-90px'><?php echo $lang->user->account;?></th>
+        <td class='w-p40'><?php echo html::input('account', $user->account, "class='form-control' autocomplete='off'");?></td>
+        <th class='w-90px'><?php echo $lang->user->email;?></th>
+        <td><?php echo html::input('email', $user->email, "class='form-control'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->password;?></th>
+        <td><?php echo html::password('password1', '', "class='form-control' autocomplete='off'");?></td>
+        <th><?php echo $lang->user->password2;?></th>
+        <td><?php echo html::password('password2', '', "class='form-control' autocomplete='off'");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->user->commiter;?></th>
+        <td><?php echo html::input('commiter', $user->commiter, "class='form-control'");?></td>
+      </tr>
+    </table>
+    <table align='center' class='table table-form'>
+      <caption class='text-left text-muted'><?php echo $lang->user->contactInfo;?></caption>
+      <tr>
+        <th class='w-90px'><?php echo $lang->user->skype;?></th>
+        <td class='w-p40'><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
+        <th class='w-90px'><?php echo $lang->user->qq;?></th>
+        <td><?php echo html::input('qq', $user->qq, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->user->yahoo;?></th>
+        <td><?php echo html::input('yahoo', $user->yahoo, "class='form-control'");?></td>
+        <th><?php echo $lang->user->gtalk;?></th>
+        <td><?php echo html::input('gtalk', $user->gtalk, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->user->wangwang;?></th>
+        <td><?php echo html::input('wangwang', $user->wangwang, "class='form-control'");?></td>
+        <th><?php echo $lang->user->mobile;?></th>
+        <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
+      </tr>
+       <tr>
+        <th><?php echo $lang->user->phone;?></th>
+        <td><?php echo html::input('phone', $user->phone, "class='form-control'");?></td>
+        <th><?php echo $lang->user->address;?></th>
+        <td><?php echo html::input('address', $user->address, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->user->zipcode;?></th>
+        <td><?php echo html::input('zipcode', $user->zipcode, "class='form-control'");?></td>
+      </tr>
+      <tr><td colspan='5' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index e1634ab1db..51a31c92fd 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -1,24 +1,25 @@
 <div id='featurebar'>
-  <div class='f-left'>
+  <ul class='nav'>
   <?php
     if(!isset($type))   $type   = 'today';
     if(!isset($period)) $period = 'today';
     $date = isset($date) ? $date : helper::today();
 
-    echo $userList . $lang->arrow;
-    echo "<span id='todoTab'>";    common::printLink('user', 'todo',     "account=$account", $lang->user->todo);  echo '</span>';
-    echo "<span id='storyTab'>";   common::printLink('user', 'story',    "account=$account", $lang->user->story); echo '</span>';
-    echo "<span id='taskTab'>";    common::printLink('user', 'task',     "account=$account", $lang->user->task);  echo '</span>';
-    echo "<span id='bugTab'>" ;    common::printLink('user', 'bug',      "account=$account", $lang->user->bug);   echo '</span>';
-    echo "<span id='testTab'>";    common::printLink('user', 'testtask', "account=$account", $lang->user->test);  echo '</span>';
-    echo "<span id='dynamicTab'>"; common::printLink('user', 'dynamic',  "type=today&account=$account", $lang->user->dynamic); echo '</span>' ;
-    echo "<span id='projectTab'>"; common::printLink('user', 'project',  "account=$account", $lang->user->project); echo '</span>';
-    echo "<span id='profileTab'>"; common::printLink('user', 'profile',  "account=$account", $lang->user->profile); echo '</span>';
+    echo '<li>' . $userList . '</li>';
+    echo '<li> &nbsp; ' . $lang->arrow . ' &nbsp; </li>';
+    echo "<li id='todoTab'>";    common::printLink('user', 'todo',     "account=$account", $lang->user->todo);  echo '</li>';
+    echo "<li id='storyTab'>";   common::printLink('user', 'story',    "account=$account", $lang->user->story); echo '</li>';
+    echo "<li id='taskTab'>";    common::printLink('user', 'task',     "account=$account", $lang->user->task);  echo '</li>';
+    echo "<li id='bugTab'>" ;    common::printLink('user', 'bug',      "account=$account", $lang->user->bug);   echo '</li>';
+    echo "<li id='testTab'>";    common::printLink('user', 'testtask', "account=$account", $lang->user->test);  echo '</li>';
+    echo "<li id='dynamicTab'>"; common::printLink('user', 'dynamic',  "type=today&account=$account", $lang->user->dynamic); echo '</li>' ;
+    echo "<li id='projectTab'>"; common::printLink('user', 'project',  "account=$account", $lang->user->project); echo '</li>';
+    echo "<li id='profileTab'>"; common::printLink('user', 'profile',  "account=$account", $lang->user->profile); echo '</li>';
 
     $activedSpan = $this->app->getMethodName() . 'Tab';
     echo "<script>$('#$activedSpan').addClass('active')</script>";
     ?>
-  </div>
+  </ul>
 </div>
 <script>
 var type   = '<?php echo $type;?>';
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index cbfc930dc2..22519ffff8 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -13,111 +13,119 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<table align='center' class='table-4'>
-  <caption>
-    <div class='f-left'> <?php echo $lang->user->profile;?></div>
-    <div class='text-right'><?php echo html::a($this->createLink('user', 'edit', "userID=$user->id"), $lang->user->editProfile); ?></div>
-  </caption>
-  <tr>
-    <th><?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->commiter;?></th>
-    <td><?php echo $user->commiter;?></td>
-  </tr>
-  <!--
-  <tr>
-    <?php // echo $lang->user->nickname;?>
-    <?php // echo $user->nickname;?>
-  </tr>
-  -->
-  <tr>
-    <th><?php echo $lang->user->email;?></th>
-    <td><?php echo $user->email;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->user->join;?></th>
-    <td><?php echo $user->join;?></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>
-  <tr>
-    <th><?php echo $lang->user->skype;?></th>
-    <td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
-  </tr>  
-  <tr>
-    <th><?php echo $lang->user->qq;?></th>
-    <td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
-  </tr>  
-  <tr>
-    <th><?php echo $lang->user->yahoo;?></th>
-    <td><?php echo $user->yahoo;?></td>
-  </tr>
-  <tr>
-    <th><?php echo $lang->user->gtalk;?></th>
-    <td><?php echo $user->gtalk;?></td>
-  </tr>  
-  <tr>
-    <th><?php echo $lang->user->wangwang;?></th>
-    <td><?php echo $user->wangwang;?></td>
-  </tr>  
-  <tr>
-    <th><?php echo $lang->user->mobile;?></th>
-    <td><?php echo $user->mobile;?></td>
-  </tr>
-   <tr>
-    <th><?php echo $lang->user->phone;?></th>
-    <td><?php echo $user->phone;?></td>
-  </tr>  
-  <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>
-</table>
+<div class='container mw-600px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix' title='USER'><?php echo html::icon($lang->icons['user']) . ' #' . $user->id;?></span>
+      <strong><?php echo $user->realname;?> (<small><?php echo $user->account;?></small>)</strong>
+      <small class='text-muted'> <?php echo $lang->user->profile;?> <?php echo html::icon('eye-open');?></small>
+    </div>
+    <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>
+  </div>
+  <table class='table table-borderless table-data'>
+    <tr>
+      <th classs='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->commiter;?></th>
+      <td><?php echo $user->commiter;?></td>
+    </tr>
+    <!--
+    <tr>
+      <?php // echo $lang->user->nickname;?>
+      <?php // echo $user->nickname;?>
+    </tr>
+    -->
+    <tr>
+      <th><?php echo $lang->user->email;?></th>
+      <td><?php echo $user->email;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->user->join;?></th>
+      <td><?php echo $user->join;?></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>
+    <tr>
+      <th><?php echo $lang->user->skype;?></th>
+      <td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->user->qq;?></th>
+      <td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->user->yahoo;?></th>
+      <td><?php echo $user->yahoo;?></td>
+    </tr>
+    <tr>
+      <th><?php echo $lang->user->gtalk;?></th>
+      <td><?php echo $user->gtalk;?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->user->wangwang;?></th>
+      <td><?php echo $user->wangwang;?></td>
+    </tr>  
+    <tr>
+      <th><?php echo $lang->user->mobile;?></th>
+      <td><?php echo $user->mobile;?></td>
+    </tr>
+     <tr>
+      <th><?php echo $lang->user->phone;?></th>
+      <td><?php echo $user->phone;?></td>
+    </tr>  
+    <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>
+  </table>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php
index 8707e178e9..ff9787279f 100644
--- a/module/user/view/project.html.php
+++ b/module/user/view/project.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<table class='table-1 tablesorter a-center'>
+<table class='table tablesorter'>
   <thead>
   <tr class='colhead'>
     <th class='w-id'><?php echo $lang->idAB;?></th>
@@ -24,13 +24,13 @@
     <th class='w-status'><?php echo $lang->statusAB;?></th>
     <th class='w-user'><?php echo $lang->team->role;?></th>
     <th class='w-date'><?php echo $lang->team->join;?></th>
-    <th class='w-date'><?php echo $lang->team->hours;?></th>
+    <th class='w-110px'><?php echo $lang->team->hours;?></th>
   </tr>
   </thead>
   <tbody>
   <?php foreach($projects as $project):?>
   <?php $projectLink = $this->createLink('project', 'browse', "projectID=$project->id");?>
-  <tr>
+  <tr class='text-center'>
     <td><?php echo html::a($projectLink, $project->id);?></td>
     <td><?php echo $project->code;?></td>
     <td><?php echo html::a($projectLink, $project->name);?></td>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 4e26f11b0c..25c2898d9b 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -13,17 +13,17 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php
-    echo "<span id='assignedToTab'>" . html::a(inlink('story', "account=$account&type=assignedTo"),  $lang->user->assignedTo) . "</span>";
-    echo "<span id='openedByTab'>"   . html::a(inlink('story', "account=$account&type=openedBy"),    $lang->user->openedBy)   . "</span>";
-    echo "<span id='reviewedByTab'>" . html::a(inlink('story', "account=$account&type=reviewedBy"),  $lang->user->reviewedBy) . "</span>";
-    echo "<span id='closedByTab'>"   . html::a(inlink('story', "account=$account&type=closedBy"),    $lang->user->closedBy)   . "</span>";
+    echo "<li id='assignedToTab'>" . html::a(inlink('story', "account=$account&type=assignedTo"),  $lang->user->assignedTo) . "</li>";
+    echo "<li id='openedByTab'>"   . html::a(inlink('story', "account=$account&type=openedBy"),    $lang->user->openedBy)   . "</li>";
+    echo "<li id='reviewedByTab'>" . html::a(inlink('story', "account=$account&type=reviewedBy"),  $lang->user->reviewedBy) . "</li>";
+    echo "<li id='closedByTab'>"   . html::a(inlink('story', "account=$account&type=closedBy"),    $lang->user->closedBy)   . "</li>";
     ?>
-  </div>
+  </ul>
 </div>
-<table class='table-1 tablesorter fixed'>
+<table class='table tablesorter table-fixed'>
   <thead>
     <tr class='colhead'>
       <th class='w-id'>    <?php echo $lang->idAB;?></th>
@@ -44,11 +44,11 @@
       <td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
       <td><span class='<?php echo 'pri' . $story->pri;?>'><?php echo $story->pri?></span></td>
       <td><?php echo $story->productTitle;?></td>
-      <td class='a-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
+      <td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
       <td><?php echo $story->planTitle;?></td>
       <td><?php echo $users[$story->openedBy];?></td>
       <td><?php echo $story->estimate;?></td>
-      <td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
+      <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
       <td><?php echo $lang->story->stageList[$story->stage];?></td>
     </tr>
     <?php endforeach;?>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 432e2ef3cf..31d2b6bf4a 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -13,18 +13,18 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php
-    echo "<span id='assignedToTab'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</span>";
-    echo "<span id='openedByTab'>"   . html::a(inlink('task', "account=$account&type=openedBy"),   $lang->user->openedBy)   . "</span>";
-    echo "<span id='finishedByTab'>" . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy) . "</span>";
-    echo "<span id='closedByTab'>"   . html::a(inlink('task', "account=$account&type=closedBy"),   $lang->user->closedBy)   . "</span>";
-    echo "<span id='canceledByTab'>" . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy) . "</span>";
+    echo "<li id='assignedToTab'>" . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "</li>";
+    echo "<li id='openedByTab'>"   . html::a(inlink('task', "account=$account&type=openedBy"),   $lang->user->openedBy)   . "</li>";
+    echo "<li id='finishedByTab'>" . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy) . "</li>";
+    echo "<li id='closedByTab'>"   . html::a(inlink('task', "account=$account&type=closedBy"),   $lang->user->closedBy)   . "</li>";
+    echo "<li id='canceledByTab'>" . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy) . "</li>";
     ?>
-  </div>
+  </ul>
 </div>
-<table class='table-1 tablesorter' id='tasktable'>
+<table class='table tablesorter' id='tasktable'>
   <thead>
   <tr class='colhead'>
     <th class='w-id'><?php echo $lang->idAB;?></th>
@@ -32,10 +32,10 @@
     <th><?php echo $lang->task->project;?></th>
     <th><?php echo $lang->task->name;?></th>
     <th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
-    <th class='w-hour'><?php echo $lang->task->consumedAB;?></th>
+    <th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
     <th class='w-hour'><?php echo $lang->task->leftAB;?></th>
     <th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
-    <th class='w-status'><?php echo $lang->statusAB;?></th>
+    <th class='w-70px'><?php echo $lang->statusAB;?></th>
   </tr>
   </thead>   
   <tbody>
@@ -43,13 +43,14 @@
   <tr class='text-center'>
     <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
     <td><span class='<?php echo 'pri' . $lang->task->priList[$task->pri];?>'><?php echo $lang->task->priList[$task->pri]?></span></td>
-    <td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></th>
-    <td class='a-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
+    <td class='nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
+    <td class='text-left nobr'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name);?></td>
     <td><?php echo $task->estimate;?></td>
     <td><?php echo $task->consumed;?></td>
     <td><?php echo $task->left;?></td>
     <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
     <td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
+  </tr>
   <?php endforeach;?>
   </tbody>
   <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 8dbb9df78f..fdedea6847 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -12,17 +12,17 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php
-    echo "<span id='testtaskTab'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him) . "</span>";
-    echo "<span id='case2HimTab'>"  . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"),  $lang->user->case2Him) . "</span>";
-    echo "<span id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"),  $lang->user->caseByHim) . "</span>";
+    echo "<li id='testtaskTab'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him) . "</li>";
+    echo "<li id='case2HimTab'>"  . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"),  $lang->user->case2Him) . "</li>";
+    echo "<li id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"),  $lang->user->caseByHim) . "</li>";
     ?>
-  </div>
+  </ul>
 </div>
 
-<table class='table-1 fixed tablesorter'>
+<table class='table tablesorter table-fixed'>
   <?php 
     $vars = "account=$account&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
     $this->app->loadLang('testtask');
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index 689b8ee5a1..ddc39cc762 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -12,16 +12,16 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include './featurebar.html.php';?>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
     <?php
-    echo "<span id='testtaskTab'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him) . "</span>";
-    echo "<span id='case2HimTab'>"  . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"),  $lang->user->case2Him) . "</span>";
-    echo "<span id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"),  $lang->user->caseByHim) . "</span>";
+    echo "<li id='testtaskTab'>"  . html::a($this->createLink('user', 'testtask', "account=$account"),  $lang->user->testTask2Him) . "</li>";
+    echo "<li id='case2HimTab'>"  . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"),  $lang->user->case2Him) . "</li>";
+    echo "<li id='caseByHimTab'>" . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"),  $lang->user->caseByHim) . "</li>";
     ?>
-  </div>
+  </ul>
 </div>
-<table class='table-1 colored tablesorter fixed'>
+<table class='table tablesorter table-fixed'>
   <?php $vars = "account=$account&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
   <thead>
   <tr class='colhead'>
@@ -38,7 +38,7 @@
   <?php foreach($tasks as $task):?>
   <tr class='text-center'>
     <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
-    <td class='a-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
+    <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
     <td class='nobr'><?php echo $task->projectName?></td>
     <td class='nobr'><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
     <td><?php echo $task->begin?></td>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 6a9788caa0..5b2c65aa2e 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -14,20 +14,20 @@
 <?php include "../../common/view/datepicker.html.php"; ?>
 <?php include './featurebar.html.php';?>
 <script language='Javascript'>var account='<?php echo $account;?>'</script>
-<div id='featurebar'>
-  <div class='f-left'>
+<div class='sub-featurebar'>
+  <ul class='nav'>
   <?php 
     foreach($lang->todo->periods as $period => $label)
     {
         $vars = "account={$account}&date=$period";
         if($period == 'before') $vars .= "&status=undone";
-        echo "<span id='$period'>" . html::a(inlink('todo', $vars), $label) . '</span> ';
+        echo "<li id='$period'>" . html::a(inlink('todo', $vars), $label) . '</li> ';
     }
     ?>
-  </div>
+  </ul>
 </div>
 <form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
-  <table class='table-1 tablesorter'>
+  <table class='table tablesorter'>
     <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
     <thead>
     <tr class='colhead'>
@@ -38,7 +38,7 @@
       <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
       <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
       <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>
-      <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
+      <th class='w-70px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
     </tr>
     </thead>
     <tbody>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 764ff9025f..94ef07983b 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -385,6 +385,7 @@ function saveWindowSize()
 function setOuterBox()
 {
     if($('.outer > .side').length) $('.outer').addClass('with-side');
+    if($('.sub-featurebar').length) $('#featurebar').addClass('with-sub');
 
     var resetOuterHeight = function()
     {
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index a5b54e888d..8e73918c8f 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -394,6 +394,14 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 #featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8}
 #featurebar .actions {float: right; margin-top: -2px;}
 
+/* sub featurebar */
+.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px}
+.sub-featurebar > .nav > li {float: left;}
+.sub-featurebar > .nav > li > a {padding: 5px 10px}
+.sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
+
+#featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px}
+
 /* Title bar. */
 #titlebar {background: #F8FAFE; border-bottom: 1px solid #e5e5e5; min-height: 46px; padding: 15px 20px 10px; vertical-align: bottom; position: relative;}
 #titlebar > .heading {font-size: 14px; line-height: 20px; }