diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 1bb962b51b..a3f2692fe7 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -28,6 +28,7 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
 
 .input-group-addon.w-90px{min-width:90px;}
 .input-group .input-group-btn .btn{padding: 6px 12px;}
+.input-group .chosen-container{min-width: 80px;}
 #all{border-left:none}
 
 .pri-selector > .btn {padding: 5px 8px!important; width: 100%;}
@@ -38,7 +39,6 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
 .title-group .chosen-container {width: 1%!important; min-width: 70px;}
 .title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
 .title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
-.title-group .has-icon-right{min-width:700px}
 #mainContent .center-block{padding-bottom:40px;}
 
 #typeBox {width:180px;}
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 6b6bd9700b..68fae98ea1 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -314,6 +314,6 @@ js::set('isStepsTemplate', $isStepsTemplate);
 </div>
 <?php js::set('bugModule', $lang->bug->module);?>
 <script>
-$(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
+$(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 3f7948f84c..6cd1e45b73 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
 $lang->project->subMenu->more->action    = array('link' => 'Verlauf|project|dynamic|projectID=%s');
 $lang->project->subMenu->more->view      = array('link' => 'Übersicht|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
+$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index f01e971aab..e6b3385ffa 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
 $lang->project->subMenu->more->action    = array('link' => 'Dynamics|project|dynamic|projectID=%s');
 $lang->project->subMenu->more->view      = array('link' => 'Overview|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
+$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 997645055b..7d33174c6d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
 $lang->project->subMenu->more->action    = array('link' => 'Historique|project|dynamic|projectID=%s');
 $lang->project->subMenu->more->view      = array('link' => "Vue d'ensemble|project|view|projectID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
+$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 814e051270..90a502b491 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->company   = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
 $lang->system->menu->scrum     = array('link' => 'Scrum Model|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
+$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
 $lang->project->subMenu->more->action    = array('link' => 'Lịch sử|project|dynamic|projectID=%s');
 $lang->project->subMenu->more->view      = array('link' => 'Tổng quan|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
+$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 5d9fedcf32..1fb1c7aefa 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
 $lang->system->menu->company   = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday');
 $lang->system->menu->scrum     = array('link' => '敏捷模型|custom|configurescrum|');
-$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|');
+$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|', 'alias' => 'browse');
 
 $lang->subject = new stdclass();
 $lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => '白名单|project|wh
 $lang->project->subMenu->more->action    = array('link' => '动态|project|dynamic|projectID=%s');
 $lang->project->subMenu->more->view      = array('link' => '概况|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 
-$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
+$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
 
 $lang->task  = new stdclass();
 $lang->build = new stdclass();
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 9eabf844e7..d57eba9c36 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -35,11 +35,11 @@
         <th class='w-id'>   <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
         <th>                <?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
         <th class='w-120px'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
-        <th class='w-100px'><?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
+        <th class='w-120px'><?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
         <th class='w-90px'> <?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
         <th class='w-90px'> <?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
         <th class='w-80px'> <?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='c-actions-5'><?php echo $lang->actions;?></th>
+        <th class='c-actions-6'><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -48,7 +48,7 @@
         <td class="c-id"><?php printf('%03d', $task->id);?></td>
         <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name, '', "data-group='project'");?></td>
         <td class='nobr'><?php echo $task->projectName?></td>
-        <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?></td>
+        <td class='nobr' title='<?php echo $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?></td>
         <td><?php echo $task->begin?></td>
         <td><?php echo $task->end?></td>
         <td title='<?php echo $task->status?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
diff --git a/module/product/control.php b/module/product/control.php
index c0a7ce0d76..078a0808f3 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -376,7 +376,7 @@ class product extends control
             /* Change the projects set of the program. */
             if(($_POST['program'] != $product->program) and $projects)
             {
-                $this->product->updateProjects($projects, $_POST['program'], $_POST['comfirmChange']);
+                $this->product->updateProjects($projects, $_POST['program'], $_POST['confirmChange']);
             }
 
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/product/js/edit.js b/module/product/js/edit.js
index 187eed0e8b..3ab6c61bea 100644
--- a/module/product/js/edit.js
+++ b/module/product/js/edit.js
@@ -26,11 +26,11 @@ $(function()
             if(singleLinkProjects) alert(PGMChangeTip);
             if(multipleLinkProjects && confirm(confirmChangePGM))
             {
-                $('#comfirmChange').val('yes');
+                $('#confirmChange').val('yes');
             }
             else
             {
-                $('#comfirmChange').val('no');
+                $('#confirmChange').val('no');
             }
         }
     })
diff --git a/module/product/model.php b/module/product/model.php
index 13bffd140b..95c06ce9df 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -545,7 +545,7 @@ class productModel extends model
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->join('whitelist', ',')
             ->stripTags($this->config->product->editor->edit['id'], $this->config->allowedTags)
-            ->remove('uid,comfirmChange')
+            ->remove('uid,confirmChange')
             ->get();
 
         $product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $this->post->uid);
@@ -1516,11 +1516,11 @@ class productModel extends model
      * @access public
      * @return void
      */
-    public function updateProjects($projects, $programID, $comfirmChange = 'no')
+    public function updateProjects($projects, $programID, $confirmChange = 'no')
     {
         foreach($projects as $project)
         {
-            if((count($project->product) == 1) or $comfirmChange == 'yes')
+            if((count($project->product) == 1) or $confirmChange == 'yes')
             {
                 $this->dao->update(TABLE_PROJECT)
                     ->set('parent')->eq($programID)
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 077832c3cc..4da0b1fdbd 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -33,7 +33,7 @@
           <tr>
             <th class='w-140px'><?php echo $lang->product->program;?></th>
             <td><?php echo html::select('program', $programs, $product->program, "class='form-control chosen'");?></td>
-            <td><?php echo html::hidden('comfirmChange', 'no');?></td>
+            <td><?php echo html::hidden('confirmChange', 'no');?></td>
           </tr>
           <?php endif;?>
           <tr>
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 5d7b7ff75f..3c00650367 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -182,7 +182,7 @@ class programplanModel extends model
             $data = new stdclass();
             $data->id         = $plan->id;
             $data->type       = 'plan';
-            $data->text       = empty($plan->milestone) ? $plan->name : $isMilestone . $plan->name;
+            $data->text       = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
             $data->percent    = $plan->percent;
             $data->attribute  = zget($this->lang->stage->typeList, $plan->attribute);
             $data->milestone  = zget($this->lang->programplan->milestoneList, $plan->milestone);
@@ -736,7 +736,7 @@ class programplanModel extends model
                 echo sprintf('%03d', $plan->id);
                 break;
             case 'name':
-                $milestoneFlag = $plan->milestone ? " <i class='icon icon-flag' title={$this->lang->programplan->milestone} style='color:red'></i>" : '';
+                $milestoneFlag = $plan->milestone ? " <i class='icon icon-flag red' title={$this->lang->programplan->milestone}'></i>" : '';
                 if($plan->grade > 1) echo '<span class="label label-badge label-light" title="' . $this->lang->programplan->children . '">' . $this->lang->programplan->childrenAB . '</span> ';
                 echo $plan->name . $milestoneFlag;
                 if(!empty($plan->children)) echo '<a class="plan-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index d7c7ffffd4..3fff8bde4b 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -179,7 +179,8 @@ class projectreleaseModel extends model
         $this->dao->insert(TABLE_RELEASE)->data($release)
             ->autoCheck()
             ->batchCheck($this->config->release->create->requiredFields, 'notempty')
-            ->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'");
+            ->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'")
+            ->exec();
 
         if(dao::isError())
         {
diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php
index 8b6600de9b..5eedacbc32 100644
--- a/module/projectrelease/view/browse.html.php
+++ b/module/projectrelease/view/browse.html.php
@@ -62,7 +62,7 @@
         <td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td>
           <?php 
-          $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
+          $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
           echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
           ?>
         </td>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 742ead1ffa..9518a5a81b 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -22,7 +22,7 @@
     <div class='page-title'>
       <span class='label label-id'><?php echo $release->id;?></span>
       <span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
-      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
+      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';?>
       <?php echo $flagIcon;?>
       <?php if($release->deleted):?>
       <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 64b047ea20..f3dec90d63 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -64,7 +64,7 @@
         <td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
         <td>
           <?php 
-          $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
+          $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
           echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
           ?>
         </td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 673d23b267..3ec1c8f08a 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -22,7 +22,7 @@
     <div class='page-title'>
       <span class='label label-id'><?php echo $release->id;?></span>
       <span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
-      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
+      <?php $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';?>
       <?php echo $flagIcon;?>
       <?php if($release->deleted):?>
       <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 9485914ca1..2303ddec08 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
+<style>.chosen-container .chosen-results{max-height: 170px; overflow-y: initial;}</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <div class="page-title">
diff --git a/module/workestimation/model.php b/module/workestimation/model.php
index 6bcce1c500..3466145a61 100644
--- a/module/workestimation/model.php
+++ b/module/workestimation/model.php
@@ -46,7 +46,10 @@ class workestimationModel extends model
      */
     public function save($projectID)
     {
-        $data = fixer::input('post')->setDefault('PRJ', $projectID)->get();
+        $data = fixer::input('post')
+            ->setDefault('PRJ', $projectID)
+            ->setIF(!isset($_POST['productivity']), 'productivity', 1)
+            ->get();
 
         $budget = $this->getBudget($projectID);
         if(!empty($budget)) $data->id = $budget->id;
diff --git a/module/workestimation/view/index.html.php b/module/workestimation/view/index.html.php
index d1512ecf67..e2c10302fb 100644
--- a/module/workestimation/view/index.html.php
+++ b/module/workestimation/view/index.html.php
@@ -36,10 +36,11 @@
             <th><?php echo $lang->workestimation->productivity;?></th>
             <td>
               <div class='input-group'>
-                <?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control'");?>
+                <?php $disabled = $hourPoint == 0 ? 'disabled' : '';?>
+                <?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control' $disabled");?>
                 <span class='input-group-addon unify-padding'>
                 <?php
-                  if($hourPoint == 0) echo $lang->custom->unitList['efficiency'] . $lang->hourCommon;
+                  if($hourPoint == 0) echo $lang->hourCommon;
                   if($hourPoint == 1) echo $lang->custom->unitList['efficiency'] . $lang->hourCommon;
                   if($hourPoint == 2) echo $lang->custom->unitList['manhour'] . $lang->custom->unitList['loc'];
                 ?>