diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index ee5c07e8b9..bc6701a873 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -924,7 +924,7 @@ $lang->menu->scrum->ci             = '代码|repo|browse';
 $lang->menu->scrum->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
 $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse');
 $lang->menu->scrum->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
-$lang->menu->scrum->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv');
+$lang->menu->scrum->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv,prjwhitelist,prjaddwhitelist');
 
 $lang->scrum = new stdclass();
 $lang->scrum->subMenu = new stdclass();
@@ -957,7 +957,7 @@ $lang->menu->waterfall->qa             = '测试|qa|index';
 $lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
 $lang->menu->waterfall->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
 $lang->menu->waterfall->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc');
-$lang->menu->waterfall->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv');
+$lang->menu->waterfall->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv,prjwhitelist,prjaddwhitelist');
 
 $lang->waterfall = new stdclass();
 $lang->waterfall->subMenu = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index 31b2e84b02..a413037d23 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1733,6 +1733,7 @@ EOD;
 
         /* If is the program admin, have all program privs. */
         $inProject = isset($lang->navGroup->$module) && $lang->navGroup->$module == 'project';
+        if($module == 'program' && strpos($method, 'prj') !== false) $inProject = true;
         if($inProject && $app->session->PRJ && strpos(",{$app->user->rights['projects']},", ",{$app->session->PRJ},") !== false) return true;
 
         /* If not super admin, check the rights. */
diff --git a/module/group/model.php b/module/group/model.php
index c195a182de..9ede66f310 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -453,7 +453,7 @@ class groupModel extends model
             $data = new stdclass();
             $data->group   = $groupID;
             $data->account = $account;
-            $data->program = implode($programs[$account], ',');
+            $data->PRJ     = implode($programs[$account], ',');
 
             $this->dao->replace(TABLE_USERGROUP)->data($data)->exec();
             foreach($programs[$account] as $programID) 
diff --git a/module/group/view/manageprjadmin.html.php b/module/group/view/manageprjadmin.html.php
index d4f2c86332..38565ce9bf 100644
--- a/module/group/view/manageprjadmin.html.php
+++ b/module/group/view/manageprjadmin.html.php
@@ -58,7 +58,7 @@
           </td>
           <td class='pv-10px' colspan='2'>
             <div class='input-group'>
-              <span class='input-group-addon'> <?php echo $lang->group->program;?></span>
+              <span class='input-group-addon'> <?php echo $lang->group->PRJ;?></span>
               <?php echo html::select('program[0][]', $programs, '', "class='form-control chosen' multiple");?>
             </div>
           </td>
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index 88a1801d80..bae756c12e 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -28,7 +28,7 @@
 <div id='mainContent' class='main-row fade'>
   <div class='main-col'>
     <?php if(!empty($whitelist)):?>
-    <form class='main-table table-user' data-ride='table' action='' method='post' id='userListForm'>
+    <form class='main-table table-user' action='' method='post' id='userListForm'>
       <table class='table has-sort-head' id='userList'>
         <thead>
         <tr>
diff --git a/module/program/control.php b/module/program/control.php
index d9c94514b0..7300f8284d 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -991,7 +991,7 @@ class program extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            $locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
+            $locateLink = inLink('PRJView', "projectID=$projectID");
             if($from == 'pgmbrowse')  $locateLink = inLink('PGMBrowse');
             if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
@@ -1705,7 +1705,7 @@ class program extends control
             $diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
             if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
 
-            $locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
+            $locateLink = inLink('PRJManageProducts', "projectID=$projectID");
             if($from == 'pgmbrowse')  $locateLink = inLink('PGMBrowse');
             if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
diff --git a/module/program/view/prjview.html.php b/module/program/view/prjview.html.php
index 7d0dbbf5dc..56d44b0134 100644
--- a/module/program/view/prjview.html.php
+++ b/module/program/view/prjview.html.php
@@ -143,16 +143,16 @@
         if(!$project->deleted)
         {
             echo "<div class='divider'></div>";
-            common::printIcon('program', 'PRJStart',    "projectID=$project->id", $project, 'button', 'play', '', 'iframe', true);
-            common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'button', 'magic', '', 'iframe', true);
-            common::printIcon('program', 'PRJSuspend',  "projectID=$project->id", $project, 'button', 'pause', '', 'iframe', true);
-            common::printIcon('program', 'PRJClose',    "projectID=$project->id", $project, 'button', 'off', '', 'iframe', true);
+            common::printIcon('program', 'PRJStart',    "projectID=$project->id", $project, 'button', 'play', '', 'iframe', true, '', $lang->project->start);
+            common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'button', 'magic', '', 'iframe', true, '', $lang->project->activate);
+            common::printIcon('program', 'PRJSuspend',  "projectID=$project->id", $project, 'button', 'pause', '', 'iframe', true, '', $lang->project->suspend);
+            common::printIcon('program', 'PRJClose',    "projectID=$project->id", $project, 'button', 'off', '', 'iframe', true, '', $lang->close);
 
             echo $this->buildOperateMenu($project, 'view');
 
             echo "<div class='divider'></div>";
-            common::printIcon('program', 'PRJEdit', $params, $project, 'button', 'edit');
-            common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin');
+            common::printIcon('program', 'PRJEdit', $params, $project, 'button', 'edit', '', '', '', '', $lang->close);
+            common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
         }
         ?>
       </div>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index 29cb66805b..bfed3e13b2 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -81,7 +81,7 @@
         <td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
         <?php endif;?>
         <td><?php echo zget($users, $story->openedBy);?></td>
-        <td class='text-center'><?php echo $story->estimate;?></td>
+        <td class='text-center'><?php echo $story->estimate . $config->hourUnit;?></td>
       </tr>
       <?php $storyCount++;?>
       <?php endforeach;?>
diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php
index 9e933166f0..dabcd9e01b 100644
--- a/module/project/view/storykanban.html.php
+++ b/module/project/view/storykanban.html.php
@@ -80,7 +80,7 @@ $account = $this->app->user->account;
                     <?php if($canBeChanged and common::hasPriv('project', 'unlinkStory')):?>
                     <div class='pull-right'><?php echo html::a($this->createLink('project', 'unlinkStory', "projectID=$projectID&story=$story->id"), "<i class='icon icon-unlink icon-sm'></i>", 'hiddenwin', "title='{$lang->project->unlinkStory}'");?></div>
                     <?php endif;?>
-                    <div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>
+                    <div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . "$config->hourUnit ";?></div>
                   </div>
                 </div>
                 <?php endforeach?>
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index c20c025b0a..cb470a2869 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -58,7 +58,7 @@
           <td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
           <td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
           <td><?php echo zget($users, $story->openedBy);?></td>
-          <td><?php echo $story->estimate;?></td>
+          <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
           <td><?php echo $lang->story->stageList[$story->stage];?></td>
         </tr>