diff --git a/views/bootstrap/class.Tasks.php b/views/bootstrap/class.Tasks.php
index 5fa54654a..0bab3c497 100644
--- a/views/bootstrap/class.Tasks.php
+++ b/views/bootstrap/class.Tasks.php
@@ -68,45 +68,42 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
-				$tasks['receipt'] = array();
-				$resArr = $dms->getDocumentList('ReceiptByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		if(!$tasksinmenu || in_array('receipt', $tasksinmenu)) {
+			$tasks['receipt'] = array();
+			$resArr = $dms->getDocumentList('ReceiptByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['receipt'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
-				$tasks['revision'] = array();
-				$resArr = $dms->getDocumentList('ReviseByMe', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('revision', $tasksinmenu)) {
+			$tasks['revision'] = array();
+			$resArr = $dms->getDocumentList('ReviseByMe', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['revision'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
-		if($workflowmode == 'traditional')
-			if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
-				$tasks['needscorrection'] = array();
-				$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
-				if($resArr) {
-					foreach ($resArr as $res) {
-						$document = $dms->getDocument($res["id"]);
-						if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-							$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
-						}
+		}
+		if(!$tasksinmenu || in_array('needscorrection', $tasksinmenu)) {
+			$tasks['needscorrection'] = array();
+			$resArr = $dms->getDocumentList('NeedsCorrectionOwner', $user);
+			if($resArr) {
+				foreach ($resArr as $res) {
+					$document = $dms->getDocument($res["id"]);
+					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$tasks['needscorrection'][] = array('id'=>$res['id'], 'name'=>$res['name']);
 					}
 				}
 			}
+		}
 		if($workflowmode == 'advanced')
 			if(!$tasksinmenu || in_array('workflow', $tasksinmenu)) {
 				$tasks['workflow'] = array();
@@ -188,14 +185,14 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 			$ct[] = count($tasks['review']);
 		if(isset($tasks['approval']))
 			$ct[] = count($tasks['approval']);
+		if(isset($tasks['workflow']))
+			$ct[] = count($tasks['workflow']);
 		if(isset($tasks['receipt']))
 			$ct[] = count($tasks['receipt']);
 		if(isset($tasks['revision']))
 			$ct[] = count($tasks['revision']);
 		if(isset($tasks['needscorrection']))
 			$ct[] = count($tasks['needscorrection']);
-		if(isset($tasks['workflow']))
-			$ct[] = count($tasks['workflow']);
 		$content .= implode('/', $ct);
 		$content .= ")";
 		if(!empty($tasks['review']) || !empty($tasks['approval']) || !empty($tasks['receipt']) || !empty($tasks['revision']) || !empty($tasks['needscorrection']) || !empty($tasks['workflow'])) {
@@ -223,17 +220,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$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";
-		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>";
-		}
-		$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";
@@ -245,6 +231,17 @@ class SeedDMS_View_Tasks extends SeedDMS_Bootstrap_Style {
 		$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";
+		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>";
+		}
+		$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";