diff --git a/module/project/css/manageproducts.css b/module/project/css/manageproducts.css
index 1877405f76..88e5890170 100644
--- a/module/project/css/manageproducts.css
+++ b/module/project/css/manageproducts.css
@@ -1,9 +1,9 @@
-.row {padding: 20px;}
-#productsBox .row > .product {border:1px solid #ddd;margin-bottom:5px; width:32%; margin-right:8px; padding: 0; position: relative;}
-#productsBox .row > .product label {display:block; cursor: pointer; margin: 0; padding: 8px 10px 8px 30px;}
-#productsBox .row > .product:hover {background: #f1f1f1; cursor: pointer;}
-#productsBox .row > .product.checked, #productsBox .row > .product.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}
-.product + .product {margin-left: 0;}
-#productsBox .row > .product.has-branch label {margin-right: 40%;}
-#productsBox .row > .product.has-branch > .form-control,
-#productsBox .row > .product.has-branch > .chosen-container {position: absolute; width: 40%!important; right: 1px; top: 1px;}
+#productsBox .product {border: 1px solid #ddd; margin-bottom:5px; position: relative; height: 40px; border-radius: 4px;}
+#productsBox .product:hover {background: #f1f1f1;}
+#productsBox .product.checked,
+#productsBox .product.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}
+#productsBox .product .checkbox-primary {padding: 9px; cursor: pointer;}
+#productsBox .product.has-branch {padding-right: 40%;}
+#productsBox .product.has-branch > .chosen-container {position: absolute; width: 40%!important; right: 3px; top: 3px;}
+#productsBox .product.has-branch > .chosen-container > .chosen-single {background: rgba(0,0,0,.05);}
+#productsBox .product.has-branch > .chosen-container > .chosen-single:hover {background: #fff;}
diff --git a/module/project/js/manageproducts.js b/module/project/js/manageproducts.js
index c34fa40763..f89adde86e 100644
--- a/module/project/js/manageproducts.js
+++ b/module/project/js/manageproducts.js
@@ -2,20 +2,13 @@ $(function()
 {
     $('#productsBox input:checkbox').each(function()
     {
-        var cb = $(this);
-        if(cb.prop('checked')) cb.closest('.col-sm-4').addClass('checked');
+        var $cb = $(this);
+        if($cb.prop('checked')) $cb.closest('.product').addClass('checked');
     });
 
     $('#productsBox input:checkbox').change(function()
     {
-        var cb = $(this);
-        cb.closest('.col-sm-4').toggleClass('checked', cb.prop('checked'));
+        var $cb = $(this);
+        $cb.closest('.product').toggleClass('checked', $cb.prop('checked'));
     });
-
-    var $hasBranch = $('#productsBox .col-sm-4 .col-sm-6');
-    if($hasBranch.size() > 0)
-    {
-        newPadding = ($hasBranch.parent().css('padding-top').replace('px', '') - 1) + 'px';
-        $hasBranch.parent().css({"padding-top" : newPadding, "padding-bottom" : newPadding});
-    }
-})
+});
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 1ebe31b986..6032a29e04 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -25,16 +25,19 @@
           <?php foreach($allProducts as $productID => $productName):?>
           <?php if(isset($linkedProducts[$productID])):?>
           <?php $checked = 'checked';?>
-          <div class='product col-sm-4 <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
-            <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';>
-              <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'> $productName";?>
-            </label>
-            <?php
-            if(isset($branchGroups[$productID]))
-            {
-                echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
-            }
-            ?>
+          <div class='col-sm-4'>
+            <div class='product <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
+              <div class="checkbox-primary">
+                <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'>";?>
+                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
+              </div>
+              <?php
+              if(isset($branchGroups[$productID]))
+              {
+                  echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
+              }
+              ?>
+            </div>
           </div>
           <?php unset($allProducts[$productID]);?>
           <?php endif;?>
@@ -45,16 +48,19 @@
         <div class='detail-title'><?php echo $lang->project->unlinkedProducts;?></div>
         <div class='detail-content row'>
           <?php foreach($allProducts as $productID => $productName):?>
-          <div class='col-sm-4 product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
-            <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';>
-              <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'> $productName";?>
-            </label>
-            <?php
-            if(isset($branchGroups[$productID]))
-            {
-                echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
-            }
-            ?>
+          <div class='col-sm-4'>
+            <div class='product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
+              <div class="checkbox-primary">
+                <?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'>";?>
+                <label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
+              </div>
+              <?php
+              if(isset($branchGroups[$productID]))
+              {
+                  echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
+              }
+              ?>
+            </div>
           </div>
           <?php endforeach;?>
         </div>
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 8f05e88ad6..ff2781be2f 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -15,8 +15,8 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <div class="pull-left table-group-btns">
-      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->testtask->collapseAll;?> <i class="icon-fold-all"></i></button>
-      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->testtask->expandAll;?> <i class="icon-unfold-all"></i></button>
+      <button type="button" class="btn btn-link group-collapse-all"><?php echo $lang->testtask->collapseAll;?> <i class="icon-fold-all muted"></i></button>
+      <button type="button" class="btn btn-link group-expand-all"><?php echo $lang->testtask->expandAll;?> <i class="icon-unfold-all muted"></i></button>
     </div>
     <?php $total = 0;?>
     <?php foreach($tasks as $productTasks) $total += count($productTasks);?>
@@ -26,7 +26,7 @@
     </a>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php common::printIcon('testreport', 'browse', "objectID=$projectID&objectType=project", '', 'button','flag');?>
+    <?php common::printIcon('testreport', 'browse', "objectID=$projectID&objectType=project", '', 'button','flag muted');?>
     <?php common::printLink('testtask', 'create', "product=0&project=$projectID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
@@ -36,7 +36,7 @@
       <thead>
         <?php $vars = "projectID=$projectID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
         <?php $canTestReport = common::hasPriv('testreport', 'browse');?>
-        <tr class='divider'>
+        <tr class='<?php if($total) echo 'divider'; ?>'>
           <th class='c-side text-center'><?php common::printOrderLink('product', $orderBy, $vars, $lang->testtask->product);?></th>
           <th class="c-id">
             <?php if($canTestReport):?>