diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 070d39cec..470c5aa67 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -281,10 +281,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 
 		$menuitems = [];
 
-		$content = '';
-		$content .= "   <ul id=\"main-menu-tasks\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText('tasks')." (";
 		$ct = array();
 		if(isset($tasks['review']))
 			$ct[] = count($tasks['review']);
@@ -302,136 +298,81 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
 			$ct[] = count($tasks['rejected']);
 		if(isset($tasks['checkedout']))
 			$ct[] = count($tasks['checkedout']);
-		$content .= implode('/', $ct);
-		$content .= ")";
 
 		$menuitems['tasks'] = array('label'=>getMLText('tasks')." (".implode('/', $ct).")");
 		$menuitems['tasks']['children'] = [];
 
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow']) || !empty($tasks['rejected']) || !empty($tasks['rejected']) || !empty($tasks['checkedout'])) {
-		$content .= " <i class=\"fa fa-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		if(!empty($tasks['review'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_review")."</a>\n";
-		$content .= "       <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['review'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "      <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['review'] = array('label'=>getMLText('documents_to_review'), 'children'=>$subitems);
 
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['approval'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_approve")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['approval'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revapp", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['approval'] = array('label'=>getMLText('documents_to_approve'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['workflow'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_trigger_workflow")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['workflow'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=workflow", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['workflow'] = array('label'=>getMLText('documents_to_trigger_workflow'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['receipt'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_receipt")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['receipt'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=recipients", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['receipt'] = array('label'=>getMLText('documents_to_receipt'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['revision'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_revise")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['revision'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revision\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=revision", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['revision'] = array('label'=>getMLText('documents_to_revise'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['needscorrection'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_to_correct")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['needscorrection'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['needscorrection'] = array('label'=>getMLText('documents_to_correct'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['rejected'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_rejected")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['rejected'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['rejected'] = array('label'=>getMLText('documents_rejected'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if(!empty($tasks['checkedout'])) {
-		$content .= "      <li class=\"dropdown-submenu\">\n";
-		$content .=	"       <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("documents_checked_out_by_you")."</a>\n";
-		$content .= "         <ul class=\"dropdown-menu\" role=\"menu\">\n";
 		$subitems = [];
 		foreach($tasks['checkedout'] as $t) {
 			$doc = $dms->getDocument($t['id']);
-			$content .= "       <li><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo\" class=\"table-row-document\" rel=\"document_".$doc->getID()."\">".$doc->getName()."</a></li>";
 			$subitems[] = array('label'=>$doc->getName(), 'link'=>"../out/out.ViewDocument.php?documentid=".$doc->getID()."&currenttab=docinfo", 'class'=>"table-row-document", 'rel'=>"document_".$doc->getID());
 		}
 		$menuitems['tasks']['children']['checkedout'] = array('label'=>getMLText('documents_checked_out_by_you'), 'children'=>$subitems);
-		$content .= "       </ul>\n";
-		$content .= "      </li>\n";
 		}
 		if ($accessobject->check_view_access('MyDocuments')) {
 		$menuitems['tasks']['children']['divider'] = array('divider'=>true);
-		$menuitems['tasks']['children']['mydocuments'] = array('label'=>getMLText('my_documents'), 'href'=>'../out/out.MyDocuments.php');
+		$menuitems['tasks']['children']['mydocuments'] = array('label'=>getMLText('my_documents'), 'link'=>'../out/out.MyDocuments.php');
 		}
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
 		self::showNavigationBar($menuitems, array('right'=>true));
-		//echo $content;
 		}
 	} /* }}} */