diff --git a/module/block/control.php b/module/block/control.php
index c8e9bc0d06..4e1560d6aa 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -875,6 +875,7 @@ class block extends control
             ->orderBy($orderBy)
             ->beginIF($this->viewType != 'json')->limit($num)->fi()
             ->fetchAll('id');
+        $projectIDList = array_keys($projects);
 
 
         /* Get tasks. */
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index dcf316b9ea..30e3a559c5 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -307,38 +307,37 @@
     </div>
   </div>
 </div>
-div>
 
-php
-arams        = "bugID=$bug->id";
-opyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
-onvertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
-
-iv id="mainActions">
-<?php common::printPreAndNext($preAndNext);?>
-<div class="btn-toolbar">
-  <?php if(!$bug->deleted):?>
-  <?php
-  common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
-  common::printIcon('bug', 'assignTo',   $params, $bug, 'button', '', '', 'iframe', true);
-  common::printIcon('bug', 'resolve',    $params, $bug, 'button', '', '', 'iframe showinonlybody', true);
-  common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
-  common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
-
-  if($this->config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
-  common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
-
-  echo "<div class='divider'></div>";
-  common::printIcon('bug', 'edit', $params, $bug);
-  common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
-  common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
-
-  echo "<div class='divider'></div>";
-  common::printBack($browseLink);
-  ?>
-  <?php else:?>
-  <?php common::printBack($browseLink);?>
-  <?php endif;?>
+<?php
+$params        = "bugID=$bug->id";
+$copyParams    = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
+$convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
+?>
+<div id="mainActions">
+  <?php common::printPreAndNext($preAndNext);?>
+  <div class="btn-toolbar">
+    <?php common::printBack($browseLink);?>
+    <?php if(!$bug->deleted):?>
+    <div class='divider'></div>
+    <?php
+    common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
+    common::printIcon('bug', 'assignTo',   $params, $bug, 'button', '', '', 'iframe', true);
+    common::printIcon('bug', 'resolve',    $params, $bug, 'button', '', '', 'iframe showinonlybody', true);
+    common::printIcon('bug', 'close',      $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
+    common::printIcon('bug', 'activate',   $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
+  
+    if($this->config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
+    common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
+  
+    echo "<div class='divider'></div>";
+    common::printIcon('bug', 'edit', $params, $bug);
+    common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
+    common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
+    ?>
+    <?php else:?>
+    <?php common::printBack($browseLink);?>
+    <?php endif;?>
+  </div>
 </div>
 <?php include '../../common/view/syntaxhighlighter.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 4c99d5ccd7..309578113b 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -78,8 +78,8 @@
               <div class="detail-content article-content">
                 <p><span class="text-limit" data-limit-size="40"><?php echo $product->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></p>
                 <p>
-                  <span class="label label-primary label-outline"><?php echo zget($lang->product->typeList, $product->type);?></span>
-                  <span class="label label-success label-outline"><?php echo zget($lang->product->statusList, $product->status);?></span>
+                  <span class="label label-primary label-outline" title='<?php echo $lang->product->type;?>'><?php echo zget($lang->product->typeList, $product->type);?></span>
+                  <span class="label label-success label-outline" title='<?php echo $lang->product->status;?>'><?php echo zget($lang->product->statusList, $product->status);?></span>
                   <?php if($product->deleted):?>
                   <span class='label label-danger label-outline'><?php echo $lang->product->deleted;?></span>
                   <?php endif; ?>
@@ -210,9 +210,10 @@
     <?php
     $params = "product=$product->id";
     $browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
+    common::printBack($browseLink);
     if(!$product->deleted)
     {
-        ob_start();
+        echo "<div class='divider'></div>";
         if($product->status != 'closed')
         {
             common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
@@ -221,15 +222,10 @@
 
         common::printIcon('product', 'edit', $params, $product);
         common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
-        common::printRPN($browseLink);
-
-        $actionLinks = ob_get_contents();
-        ob_end_clean();
-        echo $actionLinks;
     }
     else
     {
-        common::printRPN($browseLink);
+        common::printBack($browseLink);
     }
     ?>
   </div>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 747c9ff385..ce92957d56 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -203,30 +203,23 @@
     <?php
     $params = "project=$project->id";
     $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id");
+    common::printBack($browseLink);
     if(!$project->deleted)
     {
-        ob_start();
-        echo "<div class='btn-group'>";
+        echo "<div class='divider'></div>";
         common::printIcon('project', 'start',    "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
         common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
         common::printIcon('project', 'putoff',   "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
         common::printIcon('project', 'suspend',  "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
         common::printIcon('project', 'close',    "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
-        echo '</div>';
 
-        echo "<div class='btn-group'>";
+        echo "<div class='divider'></div>";
         common::printIcon('project', 'edit', $params, $project);
         common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
-        echo '</div>';
-        common::printRPN($browseLink);
-
-        $actionLinks = ob_get_contents();
-        ob_end_clean();
-        echo $actionLinks;
     }
     else
     {
-        common::printRPN($browseLink);
+        common::printBack($browseLink);
     }
     ?>
   </div>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 2ce219fcb3..9bf895b888 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -335,9 +335,10 @@
 <div id="mainActions">
   <?php common::printPreAndNext($preAndNext);?>
   <div class="btn-toolbar">
+    <?php common::printBack($browseLink);?>
     <?php if(!$task->deleted):?>
+    <div class='divider'></div>
     <?php
-    common::printBack($browseLink);
     common::printIcon('task', 'assignTo',       "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
     common::printIcon('task', 'start',          "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
     common::printIcon('task', 'restart',        "taskID=$task->id", $task, 'button', '', '', 'iframe', true);