diff --git a/module/project/control.php b/module/project/control.php
index 2f462e2593..c8c756e389 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1221,6 +1221,8 @@ class project extends control
         $project = $this->project->getById($projectID, true);
         if(!$project) die(js::error($this->lang->notFound) . js::locate('back'));
 
+        $products = $this->project->getProducts($project->id);
+
         /* Set menu. */
         $this->project->setMenu($this->projects, $project->id);
 
@@ -1228,11 +1230,12 @@ class project extends control
         $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
         $this->view->position[] = $this->view->title;
 
-        $this->view->project  = $project;
-        $this->view->products = $this->project->getProducts($project->id);
-        $this->view->groups   = $this->loadModel('group')->getPairs();
-        $this->view->actions  = $this->loadModel('action')->getList('project', $projectID);
-        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
+        $this->view->project      = $project;
+        $this->view->products     = $products;
+        $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
+        $this->view->groups       = $this->loadModel('group')->getPairs();
+        $this->view->actions      = $this->loadModel('action')->getList('project', $projectID);
+        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
 
         $this->display();
     }
diff --git a/module/project/css/manageproducts.css b/module/project/css/manageproducts.css
index bdf0ad390b..400b0db663 100644
--- a/module/project/css/manageproducts.css
+++ b/module/project/css/manageproducts.css
@@ -1,6 +1,6 @@
 #productsBox {padding: 20px;}
 #productsBox > .col-sm-4 {padding: 8px 15px; border:1px solid #ddd; min-height:48px; margin-bottom:5px; width:32%; margin-right:8px;}
-#productsBox > .col-sm-4 label {display:block}
-#productsBox > .col-sm-4:hover {background: #f1f1f1}
+#productsBox > .col-sm-4 label {display:block; cursor: pointer;}
+#productsBox > .col-sm-4:hover {background: #f1f1f1; cursor: pointer;}
 #productsBox > .col-sm-4.checked, #productsBox > .col-sm-4.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}
 .col-sm-4+.col-sm-4 {margin-left: 0;}
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index bd5c694cf9..3ebd3a972a 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -110,7 +110,20 @@
           <tr>
             <th><?php echo $lang->project->products;?></th>
             <td>
-              <?php foreach($products as $productID => $product) echo html::a($this->createLink('product', 'browse', "productID=$productID"), $product->name) . '<br />';?>
+            <?php 
+            foreach($products as $productID => $product) 
+            {
+                if($product->type !== 'normal')
+                {
+                    echo html::a($this->createLink('product', 'browse', "productID=$productID&branch=$product->branch"), $product->name . '/' . $branchGroups[$productID][$product->branch]);
+                }
+                else
+                {
+                    echo html::a($this->createLink('product', 'browse', "productID=$productID"), $product->name);
+                }
+                echo '<br />';
+            }
+            ?>
             </td>
           </tr>
           <tr>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index d0d7c1b422..e7625774c0 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -46,7 +46,7 @@
         if(common::hasPriv('release', 'changeStatus'))
         {
             $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';
-            echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"),   '<i class="icon-toggle-' . ($release->status == 'normal' ? 'off' : 'on') . '"></i> ',  'hiddenwin', "class='btn-icon' title='{$lang->release->statusList[$changedStatus]}'");
+            echo html::a(inlink('changeStatus', "releaseID=$release->id&status=$changedStatus"),   '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ',  'hiddenwin', "class='btn-icon' title='{$lang->release->statusList[$changedStatus]}'");
         }
         common::printIcon('release', 'edit',   "release=$release->id", '', 'list');
         if(common::hasPriv('release', 'delete'))
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index a94d5ac0a7..2348a751c3 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -32,7 +32,7 @@
         if(common::hasPriv('release', 'changeStatus'))
         {
             $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';
-            echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-toggle-' . ($release->status == 'normal' ? 'off' : 'on') . '"></i> ' . $lang->release->statusList[$changedStatus], 'hiddenwin', "class='btn'");
+            echo html::a(inlink('changeStatus', "releaseID=$release->id&type=$changedStatus"), '<i class="icon-' . ($release->status == 'normal' ? 'pause' : 'play') . '"></i> ' . $lang->release->statusList[$changedStatus], 'hiddenwin', "class='btn'");
         }
         if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn'");
         if(common::hasPriv('release', 'linkBug'))   echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> '  . $lang->release->linkBug,   '', "class='btn'");
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index d8d06639a5..b5e6e6f759 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -23,15 +23,14 @@
   <thead>
   <?php $vars = "productID=$productID&branch=$branch&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
     <tr>
-      <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>               <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
-      <th>               <?php common::printOrderLink('build',   $orderBy, $vars, $lang->testtask->build);?></th>
-      <th class='w-user'><?php common::printOrderLink('owner',   $orderBy, $vars, $lang->testtask->owner);?></th>
-      <th class='w-80px'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
-      <th class='w-80px'><?php common::printOrderLink('end',     $orderBy, $vars, $lang->testtask->end);?></th>
-      <th class='w-50px'><?php common::printOrderLink('status',  $orderBy, $vars, $lang->statusAB);?></th>
-      <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
+      <th class='w-id'>   <?php common::printOrderLink('id',      $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-200px'><?php common::printOrderLink('name',    $orderBy, $vars, $lang->testtask->name);?></th>
+      <th>                <?php echo $lang->testtask->project . '/' . $lang->testtask->build;?>
+      <th class='w-user'> <?php common::printOrderLink('owner',   $orderBy, $vars, $lang->testtask->owner);?></th>
+      <th class='w-100px'><?php common::printOrderLink('begin',   $orderBy, $vars, $lang->testtask->begin);?></th>
+      <th class='w-100px'><?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='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
     </tr>
   </thead>
   <tbody>
@@ -39,14 +38,19 @@
   <tr class='text-center'>
     <td><?php echo html::a(inlink('view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
     <td class='text-left' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
-    <td class='text-left' title="<?php echo $task->projectName?>"><?php echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName);?></td>
-    <td class='text-left' title="<?php echo $task->buildName?>"><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
+    <td title="<?php echo $task->projectName . '/' . $task->buildName?>">
+      <?php
+      echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName) . '/'; 
+      $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));;
+      ?>
+    </td>
     <td><?php echo $users[$task->owner];?></td>
     <td><?php echo $task->begin?></td>
     <td><?php echo $task->end?></td>
     <td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
     <td class='text-center'>
       <?php
+      common::printIcon('testtask', 'cases',    "taskID=$task->id", 'play', 'list', 'smile');
       common::printIcon('testtask', 'view',    "taskID=$task->id", '', 'list', 'file');
       common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
       common::printIcon('testtask', 'edit',     "taskID=$task->id", '', 'list');
@@ -61,7 +65,7 @@
   </tr>
   <?php endforeach;?>
   </tbody>
-  <tfoot><tr><td colspan='9'><?php $pager->show();?></td></tr></tfoot>
+  <tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot>
 </table>
 <script>$(function(){$('#<?php echo $type?>Tab').addClass('active')})</script>
 <?php include '../../common/view/footer.html.php';?>