diff --git a/module/execution/config.php b/module/execution/config.php
index f14bd946b5..8a3c915336 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -194,13 +194,6 @@ $config->execution->datatable->fieldList['name']['fixed']    = 'left';
 $config->execution->datatable->fieldList['name']['width']    = 'auto';
 $config->execution->datatable->fieldList['name']['required'] = 'yes';
 
-if(!isset($config->setCode) or $config->setCode == 1)
-{
-    $config->execution->datatable->fieldList['code']['title']    = 'execCode';
-    $config->execution->datatable->fieldList['code']['fixed']    = 'no';
-    $config->execution->datatable->fieldList['code']['width']    = '95';
-    $config->execution->datatable->fieldList['code']['required'] = 'no';
-}
 
 if($config->systemMode == 'new')
 {
@@ -210,21 +203,23 @@ if($config->systemMode == 'new')
     $config->execution->datatable->fieldList['project']['required'] = 'no';
 }
 
-$config->execution->datatable->fieldList['PM']['title']    = 'owner';
-$config->execution->datatable->fieldList['PM']['fixed']    = 'no';
-$config->execution->datatable->fieldList['PM']['width']    = '70';
-$config->execution->datatable->fieldList['PM']['required'] = 'no';
+if(!isset($config->setCode) or $config->setCode == 1)
+{
+    $config->execution->datatable->fieldList['code']['title']    = 'execCode';
+    $config->execution->datatable->fieldList['code']['fixed']    = 'no';
+    $config->execution->datatable->fieldList['code']['width']    = '95';
+    $config->execution->datatable->fieldList['code']['required'] = 'no';
+}
 
 $config->execution->datatable->fieldList['status']['title']    = 'execStatus';
 $config->execution->datatable->fieldList['status']['fixed']    = 'no';
 $config->execution->datatable->fieldList['status']['width']    = '100';
 $config->execution->datatable->fieldList['status']['required'] = 'no';
 
-$config->execution->datatable->fieldList['progress']['title']    = 'progress';
-$config->execution->datatable->fieldList['progress']['fixed']    = 'no';
-$config->execution->datatable->fieldList['progress']['width']    = '70';
-$config->execution->datatable->fieldList['progress']['required'] = 'no';
-$config->execution->datatable->fieldList['progress']['sort']     = 'no';
+$config->execution->datatable->fieldList['PM']['title']    = 'owner';
+$config->execution->datatable->fieldList['PM']['fixed']    = 'no';
+$config->execution->datatable->fieldList['PM']['width']    = '70';
+$config->execution->datatable->fieldList['PM']['required'] = 'no';
 
 $config->execution->datatable->fieldList['openedDate']['title']    = 'openedDate';
 $config->execution->datatable->fieldList['openedDate']['fixed']    = 'no';
@@ -253,12 +248,6 @@ $config->execution->datatable->fieldList['realEnd']['width']    = '90';
 $config->execution->datatable->fieldList['realEnd']['required'] = 'no';
 $config->execution->datatable->fieldList['realEnd']['sort']     = 'no';
 
-$config->execution->datatable->fieldList['teamCount']['title']    = 'teamCount';
-$config->execution->datatable->fieldList['teamCount']['fixed']    = 'no';
-$config->execution->datatable->fieldList['teamCount']['width']    = '80';
-$config->execution->datatable->fieldList['teamCount']['required'] = 'no';
-$config->execution->datatable->fieldList['teamCount']['sort']     = 'no';
-
 $config->execution->datatable->fieldList['estimate']['title']    = 'estimate';
 $config->execution->datatable->fieldList['estimate']['fixed']    = 'no';
 $config->execution->datatable->fieldList['estimate']['width']    = '70';
@@ -277,6 +266,12 @@ $config->execution->datatable->fieldList['left']['width']    = '70';
 $config->execution->datatable->fieldList['left']['required'] = 'no';
 $config->execution->datatable->fieldList['left']['sort']     = 'no';
 
+$config->execution->datatable->fieldList['progress']['title']    = 'progress';
+$config->execution->datatable->fieldList['progress']['fixed']    = 'no';
+$config->execution->datatable->fieldList['progress']['width']    = '70';
+$config->execution->datatable->fieldList['progress']['required'] = 'no';
+$config->execution->datatable->fieldList['progress']['sort']     = 'no';
+
 $config->execution->datatable->fieldList['burn']['title']    = 'burn';
 $config->execution->datatable->fieldList['burn']['fixed']    = 'no';
 $config->execution->datatable->fieldList['burn']['width']    = '80';
diff --git a/module/project/control.php b/module/project/control.php
index 63dbbcca00..223f70fde3 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -517,7 +517,7 @@ class project extends control
         $code      = '';
         $team      = '';
         $whitelist = '';
-        $acl       = 'private';
+        $acl       = 'open';
         $auth      = 'extend';
 
         $products      = array();
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 9134efc2be..ce89350bef 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -24,6 +24,16 @@ $status = $this->session->testTaskVersionStatus;
 </style>
 <div id="mainMenu" class='clearfix'>
   <div class="btn-toolbar pull-left">
+    <div class='btn-group'>
+      <?php $viewName = $scope == 'local'? $productName : $lang->testtask->all;?>
+      <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
+      <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
+        <?php
+        echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=0&type=all,$status"), $lang->testtask->all) . "</li>";
+        echo "<li>" . html::a(inlink('browse', "productID=$productID&branch=$branch&type=local,$status"), $productName, '', "title='{$productName}' class='text-ellipsis'") . "</li>";
+        ?>
+      </ul>
+    </div>
     <?php common::sortFeatureMenu();?>
     <?php foreach($lang->testtask->featureBar['browse'] as $key => $label):?>
     <?php $key = strtolower($key);?>
@@ -99,7 +109,6 @@ $status = $this->session->testTaskVersionStatus;
       <td title="<?php echo zget($users, $task->owner);?>"><?php echo zget($users, $task->owner);?></td>
       <td><?php echo $task->begin?></td>
       <td><?php echo $task->end?></td>
-      
       <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $task) . "</td>";?>
       <td class='c-actions'>
         <?php echo $this->testtask->buildOperateMenu($task, 'browse');?>
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index d13f6c87f0..494c4466ac 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -42,7 +42,7 @@
           <th class='text-left'>   <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
           <th class='c-severity' title=<?php echo $lang->bug->severity;?>><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
           <th class='c-pri' title='<?php echo $lang->pri;?>'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-          <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
+          <th class='c-type'>      <?php common::printOrderLink('type', $orderBy, $vars, $lang->bug->type);?></th>
           <th class='c-user'>      <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
           <th class='c-user'>      <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
           <th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>