diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 5e10c520b1..7b5f85b40c 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -215,16 +215,7 @@ $lang->company->menu->addGroup    = array('link' => '<span class="icon-add1">&nb
 $lang->company->menu->addUser     = array('link' => '<span class="icon-add1">&nbsp;</span>Add User|user|create|dept=%s&from=company', 'subModule' => 'user', 'float' => 'right');
 $lang->dept->menu            = $lang->company->menu;
 $lang->group->menu           = $lang->company->menu;
-
-/* User menu. */
-$lang->user->menu->account     = '%s' . $lang->arrow;
-$lang->user->menu->todo        = array('link' => 'Todo|user|todo|account=%s', 'subModule' => 'todo');
-$lang->user->menu->task        = 'Task|user|task|account=%s';
-$lang->user->menu->bug         = 'Bug|user|bug|account=%s';
-$lang->user->menu->dynamic     = 'Dynamic|user|dynamic|type=today&account=%s';
-$lang->user->menu->projectList = 'Project|user|project|account=%s';
-$lang->user->menu->profile     = array('link' => 'Profile|user|profile|account=%s', 'alias' => 'edit');
-$lang->user->menu->browse      = array('link' => '<span class="icon-title">&nbsp;</span>Manage user|company|browse|', 'float' => 'right');
+$lang->user->menu            = $lang->company->menu;
 
 /* Admin menu. */
 $lang->admin->menu->index     = array('link' => 'Index|admin|index');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 98a42a78b4..944b01c859 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -101,16 +101,7 @@ $lang->company->menuOrder[30] = 'addGroup';
 $lang->company->menuOrder[35] = 'addUser';
 $lang->dept->menuOrder        = $lang->company->menuOrder;
 $lang->group->menuOrder       = $lang->company->menuOrder;
-
-/* user menu order. */
-$lang->user->menuOrder[0]  = 'account';
-$lang->user->menuOrder[5]  = 'todo';
-$lang->user->menuOrder[10] = 'task';
-$lang->user->menuOrder[15] = 'bug';
-$lang->user->menuOrder[20] = 'dynamic';
-$lang->user->menuOrder[25] = 'projectList';
-$lang->user->menuOrder[30] = 'profile';
-$lang->user->menuOrder[35] = 'browse';
+$lang->user->menuOrder        = $lang->company->menuOrder;
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 968e6ed483..b393af9758 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -215,16 +215,7 @@ $lang->company->menu->addGroup    = array('link' => '<span class="icon-add1">&nb
 $lang->company->menu->addUser     = array('link' => '<span class="icon-add1">&nbsp;</span>添加用户|user|create|dept=%s', 'subModule' => 'user', 'float' => 'right');
 $lang->dept->menu            = $lang->company->menu;
 $lang->group->menu           = $lang->company->menu;
-
-/* 用户信息菜单设置。*/
-$lang->user->menu->account     = '%s' . $lang->arrow;
-$lang->user->menu->todo        = array('link' => 'TODO列表|user|todo|account=%s', 'subModule' => 'todo');
-$lang->user->menu->task        = '任务列表|user|task|account=%s';
-$lang->user->menu->bug         = 'Bug列表|user|bug|account=%s';
-$lang->user->menu->dynamic     = '用户动态|user|dynamic|type=today&account=%s';
-$lang->user->menu->projectList = '项目列表|user|project|account=%s';
-$lang->user->menu->profile     = array('link' => '用户信息|user|profile|account=%s', 'alias' => 'edit');
-$lang->user->menu->browse      = array('link' => '<span class="icon-title">&nbsp;</span>用户管理|company|browse|', 'float' => 'right');
+$lang->user->menu            = $lang->company->menu;
 
 /* 后台管理菜单设置。*/
 $lang->admin->menu->index     = array('link' => '首页|admin|index');
@@ -241,7 +232,6 @@ $lang->extension->menu        = $lang->admin->menu;
 $lang->editor->menu           = $lang->admin->menu;
 $lang->mail->menu             = $lang->admin->menu;
 
-/*菜单设置：分组设置。*/
 $lang->menugroup->release     = 'product';
 $lang->menugroup->story       = 'product';
 $lang->menugroup->productplan = 'product';
diff --git a/module/common/view/datepicker.html.php b/module/common/view/datepicker.html.php
index 64fb7a2191..2b818a1f74 100644
--- a/module/common/view/datepicker.html.php
+++ b/module/common/view/datepicker.html.php
@@ -13,7 +13,7 @@ $.dpText = {
     TEXT_NEXT_YEAR      :   '明年',
     TEXT_NEXT_MONTH     :   '下个月',
     TEXT_CLOSE          :   '关闭',
-    TEXT_CHOOSE_DATE    :   '&nbsp;&nbsp;&nbsp;&nbsp;'
+    TEXT_CHOOSE_DATE    :   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'
 }
 Date.dayNames       = ['日', '一', '二', '三', '四', '五', '六'];
 Date.abbrDayNames   = ['星期天', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
diff --git a/module/user/control.php b/module/user/control.php
index dbcb54e14c..33f37659a8 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -24,6 +24,7 @@ class user extends control
         parent::__construct();
         $this->loadModel('company')->setMenu();
         $this->loadModel('dept');
+        $this->loadModel('todo');
     }
 
     /**
@@ -35,7 +36,7 @@ class user extends control
      */
     public function view($account)
     {
-        $this->locate($this->createLink('user', 'profile', "account=$account"));
+        $this->locate($this->createLink('user', 'todo', "account=$account"));
     }
 
     /**
@@ -65,10 +66,11 @@ class user extends control
         /* set menus. */
         $this->lang->set('menugroup.user', 'company');
         $this->user->setMenu($this->user->getPairs('noempty|noclosed|nodeleted'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         /* Get user, totos. */
         $user  = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
-        $todos = $this->loadModel('todo')->getList($type, $account, $status, 0, $pager);
+        $todos = $this->todo->getList($type, $account, $status, 0, $pager);
         $date  = (int)$type == 0 ? $this->todo->today() : $type;
 
         $header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->user->todo;
@@ -77,7 +79,6 @@ class user extends control
         $this->view->header   = $header;
         $this->view->position = $position;
         $this->view->tabID    = 'todo';
-        $this->view->dates    = $this->todo->buildDateList(); 
         $this->view->date     = $date;
         $this->view->todos    = $todos;
         $this->view->user     = $user;
@@ -110,6 +111,7 @@ class user extends control
         /* Set the menu. */
         $this->lang->set('menugroup.user', 'company');
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         /* Assign. */
         $header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
@@ -118,6 +120,7 @@ class user extends control
         $this->view->position = $position;
         $this->view->tabID    = 'task';
         $this->view->tasks    = $this->loadModel('task')->getUserTasks($account, 'assignedto', 0, $pager);
+        $this->view->account  = $account;
         $this->view->user     = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
         $this->view->pager    = $pager;
 
@@ -146,6 +149,7 @@ class user extends control
         /* Set menu. */
         $this->lang->set('menugroup.user', 'company');
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         /* Load the lang of bug module. */
         $this->app->loadLang('bug');
@@ -157,6 +161,7 @@ class user extends control
         $this->view->position = $position;
         $this->view->tabID    = 'bug';
         $this->view->bugs     = $this->user->getBugs($account, $pager);
+        $this->view->account  = $account;
         $this->view->user     = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
         $this->view->users    = $this->user->getPairs('noletter');
         $this->view->pager    = $pager;
@@ -177,6 +182,7 @@ class user extends control
         $this->loadModel('project');
         $this->lang->set('menugroup.user', 'company');
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         $header['title'] = $this->lang->user->common . $this->lang->colon . $this->lang->user->project;
         $position[]      = $this->lang->user->project;
@@ -184,6 +190,7 @@ class user extends control
         $this->view->position = $position;
         $this->view->tabID    = 'project';
         $this->view->projects = $this->user->getProjects($account);
+        $this->view->account  = $account;
         $this->view->user     = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
 
         $this->display();
@@ -202,6 +209,7 @@ class user extends control
 
         /* Set menu. */
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         $user = $this->user->getById($account);
         $deptPath = $this->dept->getParents($user->dept);
@@ -209,6 +217,7 @@ class user extends control
         $header['title'] = "USER #$user->id $user->account/" . $this->lang->user->profile;
         $this->view->header   = $header;
         $this->view->position = $position;
+        $this->view->account  = $account;
         $this->view->user     = $user;
 
         $this->view->deptPath = $deptPath;
@@ -488,6 +497,7 @@ class user extends control
         /* set menus. */
         $this->lang->set('menugroup.user', 'company');
         $this->user->setMenu($this->user->getPairs('noempty|noclosed'), $account);
+        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed'), $account);
 
         /* Save session. */
         $uri   = $this->app->getURI(true);
@@ -515,6 +525,7 @@ class user extends control
         $this->view->period  = $period;
         $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter');
         $this->view->account = $account;
+        $this->view->user    = $this->dao->findByAccount($account)->from(TABLE_USER)->fetch();
         $this->view->actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager);
         $this->display();
     }
diff --git a/module/user/css/common.css b/module/user/css/common.css
new file mode 100644
index 0000000000..c3966a803e
--- /dev/null
+++ b/module/user/css/common.css
@@ -0,0 +1,2 @@
+.cont-lt1 .side {width: 120px;}
+.cont-lt1 .side .box-title{padding: 3px;}
diff --git a/module/user/js/common.js b/module/user/js/common.js
new file mode 100644
index 0000000000..879bed4354
--- /dev/null
+++ b/module/user/js/common.js
@@ -0,0 +1,25 @@
+/**
+ * Switch account 
+ * 
+ * @param  string $account 
+ * @param  string $method 
+ * @access public
+ * @return void
+ */
+function switchAccount(account, method)
+{
+    if(method == 'dynamic')
+    {
+        link = createLink('user', method, 'period=' + period + '&account=' + account);
+    }
+    else if(method == 'todo')
+    {
+        link = createLink('user', method, 'account=' + account + '&type=' + type);
+    }
+    else
+    {
+        link = createLink('user', method, 'account=' + account);
+    }
+    location.href=link;
+}
+
diff --git a/module/user/js/todo.js b/module/user/js/todo.js
index 371d1d6c68..12e9e0d29d 100644
--- a/module/user/js/todo.js
+++ b/module/user/js/todo.js
@@ -1,5 +1,4 @@
 function changeDate(date)
 {
-    link = createLink('user', 'todo', 'account=' + account + '&date=' + date);
-    location.href=link;
+    location.href = createLink('user', 'todo', 'account=' + account + '&type=' + date.replace(/\-/g, ''));
 }
diff --git a/module/user/model.php b/module/user/model.php
index 2e8590717f..f81ab07cdb 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -32,6 +32,19 @@ class userModel extends model
         }
     }
 
+    /**
+     * Set users list.
+     * 
+     * @param  array    $users 
+     * @param  string   $account 
+     * @access public
+     * @return html 
+     */
+    public function setUserList($users, $account)
+    {
+        return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\"");
+    }
+
     /**
      * Get users list of current company.
      * 
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index 6df0d63cc2..ddb99947d9 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -12,6 +12,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'>
   <thead>
   <tr class='colhead'>
diff --git a/module/user/view/dynamic.html.php b/module/user/view/dynamic.html.php
index 30a4c16d48..fa1d25245e 100644
--- a/module/user/view/dynamic.html.php
+++ b/module/user/view/dynamic.html.php
@@ -12,47 +12,53 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div id='featurebar'>
-  <?php 
-  echo '<span id="today">'      . html::a(inlink('dynamic', "type=today&account=$account"),      $lang->action->dynamic->today)      . '</span>';
-  echo '<span id="yesterday">'  . html::a(inlink('dynamic', "type=yesterday&account=$account"),  $lang->action->dynamic->yesterday)  . '</span>';
-  echo '<span id="twodaysago">' . html::a(inlink('dynamic', "type=twodaysago&account=$account"), $lang->action->dynamic->twoDaysAgo) . '</span>';
-  echo '<span id="thisweek">'   . html::a(inlink('dynamic', "type=thisweek&account=$account"),   $lang->action->dynamic->thisWeek)   . '</span>';
-  echo '<span id="lastweek">'   . html::a(inlink('dynamic', "type=lastweek&account=$account"),   $lang->action->dynamic->lastWeek)   . '</span>';
-  echo '<span id="thismonth">'  . html::a(inlink('dynamic', "type=thismonth&account=$account"),  $lang->action->dynamic->thisMonth)  . '</span>';
-  echo '<span id="lastmonth">'  . html::a(inlink('dynamic', "type=lastmonth&account=$account"),  $lang->action->dynamic->lastMonth)  . '</span>';
-  echo '<span id="all">'        . html::a(inlink('dynamic', "type=all&account=$account"),        $lang->action->dynamic->all)        . '</span>';
-  ?>
-</div>
-
-<table class='table-1 colored tablesorter'>
-  <thead>
-  <tr class='colhead'>
-    <th class='w-150px'><?php echo $lang->action->date;?></th>
-    <th class='w-user'> <?php echo $lang->action->actor;?></th>
-    <th class='w-100px'><?php echo $lang->action->action;?></th>
-    <th class='w-80px'> <?php echo $lang->action->objectType;?></th>
-    <th class='w-id'>   <?php echo $lang->idAB;?></th>
-    <th><?php echo $lang->action->objectName;?></th>
+<?php include './featurebar.html.php';?>
+<table class='cont-lt1'>
+  <tr valign='top'>
+    <td class='side'>
+      <div class='box-title'><?php echo $lang->user->dynamic;?></div>
+      <div class='box-content'>
+        <?php 
+        echo html::a(inLink('dynamic', "period=today&account=$account"),      $lang->action->dynamic->today)      . '<br />';
+        echo html::a(inLink('dynamic', "period=yesterday&account=$account"),  $lang->action->dynamic->yesterday)  . '<br />';
+        echo html::a(inLink('dynamic', "period=twodaysago&account=$account"), $lang->action->dynamic->twoDaysAgo) . '<br />';
+        echo html::a(inLink('dynamic', "period=thisweek&account=$account"),   $lang->action->dynamic->thisWeek)   . '<br />';
+        echo html::a(inLink('dynamic', "period=lastweek&account=$account"),   $lang->action->dynamic->lastWeek)   . '<br />';
+        echo html::a(inLink('dynamic', "period=thismonth&account=$account"),  $lang->action->dynamic->thisMonth)  . '<br />';
+        echo html::a(inLink('dynamic', "period=lastmonth&account=$account"),  $lang->action->dynamic->lastMonth)  . '<br />';
+        echo html::a(inLink('dynamic', "period=all&account=$account"),        $lang->action->dynamic->all)        . '<br />';
+        ?>
+      </div>
+    </td>
+    <td class='divider'></td>
+    <td>
+      <table class='table-1 colored tablesorter'>
+        <thead>
+        <tr class='colhead'>
+          <th class='w-150px'><?php echo $lang->action->date;?></th>
+          <th class='w-user'> <?php echo $lang->action->actor;?></th>
+          <th class='w-100px'><?php echo $lang->action->action;?></th>
+          <th class='w-80px'> <?php echo $lang->action->objectType;?></th>
+          <th class='w-id'>   <?php echo $lang->idAB;?></th>
+          <th><?php echo $lang->action->objectName;?></th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php foreach($actions as $action):?>
+        <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
+        <tr class='a-center'>
+          <td><?php echo $action->date;?></td>
+          <td><?php echo $users[$action->actor];?></td>
+          <td><?php echo $action->actionLabel;?></td>
+          <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
+          <td><?php echo $action->objectID;?></td>
+          <td class='a-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
+        </tr>
+        <?php endforeach;?>
+        </tbody>
+        <tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
+      </table>
+    </td>
   </tr>
-  </thead>
-  <tbody>
-  <?php foreach($actions as $action):?>
-  <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-  <tr class='a-center'>
-    <td><?php echo $action->date;?></td>
-    <td><?php echo $users[$action->actor];?></td>
-    <td><?php echo $action->actionLabel;?></td>
-    <td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
-    <td><?php echo $action->objectID;?></td>
-    <td class='a-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
-  </tr>
-  <?php endforeach;?>
-  </tbody>
-  <tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
 </table>
-<script>
-$('#<?php echo $period;?>').addClass('active')
-var period = '<?php echo $period;?>';
-</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
new file mode 100755
index 0000000000..0e40319fc2
--- /dev/null
+++ b/module/user/view/featurebar.html.php
@@ -0,0 +1,25 @@
+<?php include "../../common/view/datepicker.html.php"; ?>
+<div id='featurebar'>
+  <div class='f-left'>
+  <?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='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='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>';
+
+    $activedSpan = $this->app->getMethodName() . 'Tab';
+    echo "<script>$('#$activedSpan').addClass('active')</script>";
+    ?>
+  </div>
+</div>
+<script>
+var type   = '<?php echo $type;?>';
+var period = '<?php echo $period;?>';
+</script>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index ec3c8b1628..b9d57fbfaf 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -12,6 +12,7 @@
 ?>
 <?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><?php echo $lang->user->profile;?></caption>
   <tr>
diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php
index e05ec7cf72..63d165f45d 100644
--- a/module/user/view/project.html.php
+++ b/module/user/view/project.html.php
@@ -12,6 +12,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'>
   <thead>
   <tr class='colhead'>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 959b7db353..6507f759c6 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -12,6 +12,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' id='tasktable'>
   <thead>
   <tr class='colhead'>
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index ace47ba9bc..c8a1286d2a 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -12,51 +12,58 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
+<?php include './featurebar.html.php';?>
 <script language='Javascript'>var account='<?php echo $account;?>'</script>
-<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
-   <div id='featurebar'>
-     <div class='f-left'>
-       <?php 
-       echo '<span id="today">'    . html::a(inlink('todo', "account=$account&date=today"),     $lang->todo->todayTodos)    . '</span>';
-       echo '<span id="thisweek">' . html::a(inlink('todo', "account=$account&date=thisweek"),  $lang->todo->thisWeekTodos) . '</span>';
-       echo '<span id="lastweek">' . html::a(inlink('todo', "account=$account&date=lastweek"),  $lang->todo->lastWeekTodos) . '</span>';
-      echo '<span id="future" >'   . html::a(inlink('todo', "account=$account&date=future"),    $lang->todo->futureTodos)   . '</span>';
-       echo '<span id="all">'      . html::a(inlink('todo', "account=$account&date=all"),       $lang->todo->allDaysTodos)  . '</span>';
-       echo '<span id="before">'   . html::a(inlink('todo', "account=$account&date=before&status=undone"), $lang->todo->allUndone) . '</span>';
-       echo "<span id='$date'>"    . html::select('date', $dates, $date, 'onchange=changeDate(this.value)') . '</span>';
-       ?>
-       <script>$('#<?php echo $type;?>').addClass('active')</script>
-    </div>
-  </div>
-  <table class='table-1 tablesorter'>
-    <thead>
-    <tr class='colhead'>
-	  <th class='w-id'><?php echo $lang->idAB;?></th>
-      <th class='w-date'><?php echo $lang->todo->date;?></th>
-      <th class='w-type'><?php echo $lang->todo->type;?></th>
-      <th class='w-pri'><?php echo $lang->priAB;?></th>
-      <th><?php echo $lang->todo->name;?></th>
-      <th class='w-hour'><?php echo $lang->todo->beginAB;?></th>
-      <th class='w-hour'><?php echo $lang->todo->endAB;?></th>
-      <th class='w-status'><?php echo $lang->todo->status;?></th>
-    </tr>
-    </thead>
+<table class='cont-lt1'>
+  <tr valign='top'>
+    <td class='side'>
+      <div class='box-title'><?php echo html::input('date', $date, "class='w-date date' onchange=changeDate(this.value)"); ?></div>
+      <div class='box-content'>
+        <?php 
+        echo html::a(inLink('todo', "account=$account&type=today"),    $lang->todo->todayTodos)    . '<br />';
+        echo html::a(inLink('todo', "account=$account&type=thisweek"), $lang->todo->thisWeekTodos) . '<br />';
+        echo html::a(inLink('todo', "account=$account&type=lastweek"), $lang->todo->lastWeekTodos) . '<br />';
+        echo html::a(inLink('todo', "account=$account&type=future"),   $lang->todo->futureTodos)   . '<br />';
+        echo html::a(inLink('todo', "account=$account&type=all"),      $lang->todo->allDaysTodos)  . '<br />';
+        echo html::a(inLink('todo', "account=$account&type=before"),   $lang->todo->allUndone)     . '<br />';
+        ?>
+      </div>
+    </td>
+    <td class='divider'></td>
+    <td>
+      <form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
+        <table class='table-1 tablesorter'>
+          <thead>
+          <tr class='colhead'>
+            <th class='w-id'><?php echo $lang->idAB;?></th>
+            <th class='w-date'><?php echo $lang->todo->date;?></th>
+            <th class='w-type'><?php echo $lang->todo->type;?></th>
+            <th class='w-pri'><?php echo $lang->priAB;?></th>
+            <th><?php echo $lang->todo->name;?></th>
+            <th class='w-hour'><?php echo $lang->todo->beginAB;?></th>
+            <th class='w-hour'><?php echo $lang->todo->endAB;?></th>
+            <th class='w-status'><?php echo $lang->todo->status;?></th>
+          </tr>
+          </thead>
 
-    <tbody>
-    <?php foreach($todos as $todo):?>
-    <tr class='a-center'>
-      <td><?php echo $todo->id;?></td>
-      <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?></td>
-      <td><?php echo $lang->todo->typeList->{$todo->type};?></td>
-      <td><?php echo $todo->pri;?></td>
-      <td class='a-left'><?php if(!common::printLink('todo', 'view', "todo=$todo->id", $todo->name)) echo $todo->name;?></td>
-      <td><?php echo $todo->begin;?></td>
-      <td><?php echo $todo->end;?></td>
-      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-    <?php if($type == 'all'):?><tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot><?php endif;?>
-  </table>
-</form>
+          <tbody>
+          <?php foreach($todos as $todo):?>
+          <tr class='a-center'>
+            <td><?php echo $todo->id;?></td>
+            <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?></td>
+            <td><?php echo $lang->todo->typeList->{$todo->type};?></td>
+            <td><?php echo $todo->pri;?></td>
+            <td class='a-left'><?php if(!common::printLink('todo', 'view', "todo=$todo->id", $todo->name)) echo $todo->name;?></td>
+            <td><?php echo $todo->begin;?></td>
+            <td><?php echo $todo->end;?></td>
+            <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
+          </tr>
+          <?php endforeach;?>
+          </tbody>
+          <?php if($type == 'all'):?><tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot><?php endif;?>
+        </table>
+      </form>
+    </td>
+  </tr>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/user/view/view.html.php b/module/user/view/view.html.php
index ead760ab85..a2dba1c8ff 100644
--- a/module/user/view/view.html.php
+++ b/module/user/view/view.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
+<?php include './featurebar.html.php';?>
 <div class="yui-d0 yui-t3">                 
   <div class="yui-b">
     <table class='table-1'>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 757772bd6b..9fb08c3e25 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -286,27 +286,6 @@ function saveProject()
     if($('#projectID')) $.cookie('lastProject', $('#projectID').val(), {expires:config.cookieLife, path:config.webRoot});
 }
 
-/**
- * Switch account 
- * 
- * @param  string $account 
- * @param  string $method 
- * @access public
- * @return void
- */
-function switchAccount(account, method)
-{
-    if(method == 'dynamic')
-    {
-        link = createLink('user', method, 'period=' + period + '&account=' + account);
-    }
-    else
-    {
-        link = createLink('user', method, 'account=' + account);
-    }
-    location.href=link;
-}
-
 /**
  * Set the ping url.
  *