diff --git a/application/classes/Menu.php b/application/classes/Menu.php
index c2614a98..1b1e84d3 100644
--- a/application/classes/Menu.php
+++ b/application/classes/Menu.php
@@ -23,7 +23,49 @@ class Menu {
 				if (empty($result[$mmo->id]))
 					$result[$mmo->id] = $mmo;
 
+		return static::collapse($result);
+	}
+
+	private static function collapse(array $array) {
+		$result = array();
+
+		foreach ($array as $item) {
+			if (isset($result[$item->module->name])) {
+				if (! is_array($result[$item->module->name]))
+					$result[$item->module->name] = array($result[$item->module->name]);
+
+				array_push($result[$item->module->name],$item);
+
+				continue;
+
+			} else {
+				$result[$item->module->name] = $item;
+			}
+		}
+
 		return $result;
 	}
+
+	public static function ul(array $result,array $append=NULL,$sub=FALSE) {
+		$output = $sub ? '<ul class="dropdown-menu">' : '<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">';
+
+		foreach ($result as $k => $v)
+			if (is_array($v)) {
+				$output .= sprintf('<li class="dropdown-submenu">%s%s',HTML::anchor('#',$k,array('nocg'=>TRUE)),static::ul($v,NULL,TRUE).'</li>');
+			} else
+				$output .= '<li>'.HTML::anchor($v->url(),$v->menu_display(),array('tabindex'=>-1,'nocg'=>TRUE)).'</li>';
+
+
+		if ($append) {
+			$output .= '<li class="divider"></li>';
+
+			foreach ($append as $k => $v)
+				$output .= sprintf('<li>%s</li>',HTML::anchor($k,$v,array('nocg'=>TRUE)));
+		}
+
+		$output .= '</ul>';
+
+		return $output;
+	}
 }
 ?>
diff --git a/modules/invoice/classes/Controller/Task/Invoice.php b/modules/invoice/classes/Controller/Task/Invoice.php
index 95fb83ff..1930adf8 100644
--- a/modules/invoice/classes/Controller/Task/Invoice.php
+++ b/modules/invoice/classes/Controller/Task/Invoice.php
@@ -10,6 +10,8 @@
  * @license    http://dev.osbill.net/license.html
  */
 class Controller_Task_Invoice extends Controller_Task {
+	public $auto_render = FALSE;
+
 	/**
 	 * Email a list of invoice balances
 	 *
diff --git a/modules/task/classes/Controller/Admin/Task.php b/modules/task/classes/Controller/Admin/Task.php
index f5283a79..9aa28c30 100644
--- a/modules/task/classes/Controller/Admin/Task.php
+++ b/modules/task/classes/Controller/Admin/Task.php
@@ -9,19 +9,21 @@
  * @copyright  (c) 2009-2013 Open Source Billing
  * @license    http://dev.osbill.net/license.html
  */
-class Controller_Admin_Task extends Controller_TemplateDefault_Admin {
+class Controller_Admin_Task extends Controller_Task {
+	protected $auth_required = TRUE;
+
 	protected $secure_actions = array(
-		'listlog'=>TRUE,
+		'log'=>TRUE,
 	);
 
 	/**
 	 * Show a list of tasks run
 	 */
-	public function action_listlog() {
-		Block::add(array(
-			'title'=>_('Task Log'),
-			'body'=>Table::display(
-				ORM::factory('Task_Log')->order_by('id','DESC')->find_all(),
+	public function action_log() {
+		Block::factory()
+			->title(_('Task Log'))
+			->body(Table::display(
+				ORM::factory('Task_Log')->find_all(),
 				25,
 				array(
 					'id'=>array('label'=>'ID','url'=>URL::link('admin','task/view/')),
@@ -32,8 +34,7 @@ class Controller_Admin_Task extends Controller_TemplateDefault_Admin {
 				),
 				array(
 					'page'=>TRUE,
-				)),
-			));
+				)));
 	}
 }
 ?>
diff --git a/modules/task/classes/Controller/Task.php b/modules/task/classes/Controller/Task.php
new file mode 100644
index 00000000..2452465f
--- /dev/null
+++ b/modules/task/classes/Controller/Task.php
@@ -0,0 +1,15 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides Admin TASK management
+ *
+ * @package    Task
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Controller_Task extends Controller_TemplateDefault {
+	protected $auth_required = FALSE;
+}
+?>
diff --git a/modules/task/classes/Model/Task.php b/modules/task/classes/Model/Task.php
index 71ca8c4e..b53feaf5 100644
--- a/modules/task/classes/Model/Task.php
+++ b/modules/task/classes/Model/Task.php
@@ -16,92 +16,17 @@ class Model_Task extends ORM_OSB {
 		),
 	);
 
-	public function run($force=FALSE) {
-		$r = rand(0,9999);
-		$tlo = ORM::factory('Task_Log');
-		$tlo->task_id = $this->id;
-
-		if (! $this->loaded())
-			$tlo->message = sprintf('Unknown Task ID %s',$this->id);
-
-		elseif (! $this->status)
-			$tlo->message = sprintf('Task %s is not active',$this->id);
-
-		elseif ($this->running AND ! $force)
-			$tlo->message = sprintf('Task %s is already running',$this->id);
-
-		elseif (! preg_match('/\//',$this->command))
-			$tlo->message = sprintf('Task %s uses the old configuration, ignoring :command',$this->id,$this->command);
-
-		else {
-			try {
-				// Get a lock
-				$this->running = 1;
-				$this->running_host = $r;
-				$this->save();
-
-				// Check we are the winning host to run this task
-				// @todo We need to test that the lock is not stale
-				$this->reload();
-				if ($this->running_host != $r)
-					return;
-
-				switch ($this->type) {
-					case 0:
-						$r = Request::factory($this->command)->execute();
-						break;
-
-					default:
-						throw new Kohana_Exception('Unknown task type :type',array(':type'=>$this->type));
-				}
-
-				// Clear our lock and update the last run time
-				$this->date_run = time();
-				$this->running = 0;
-				$this->running_host = NULL;
-
-				$tlo->result = 0;
-				$tlo->message = $r->body();
-			}
-			catch (Exception $e) {
-				$tlo->result = $e->getCode();
-				$tlo->message = Kohana_Exception::text($e);
-
-				$this->running = 1;
-				$this->running_host = 'ERROR';
-			}
-
-			$this->save();
-		}
-
-		if ($this->log)
-			$tlo->save();
+	private function _cron() {
+		return new Cron(sprintf('%s %s %s %s %s',$this->int_min,$this->int_hour,$this->int_month_day,$this->int_month,$this->int_week_day),$this->command);
 	}
 
-	/** LIST FUNCTIONS **/
+	/**
+	 * Calculate next run date
+	 */
+	public function next_run($format=FALSE) {
+		$x = $this->_cron()->next($this->date_run);
 
-	public function list_active() {
-		$result = array();
-
-		foreach ($this->_where_active()->find_all() as $to) {
-			$ct = sprintf('%s %s %s %s %s',$to->int_min,$to->int_hour,$to->int_month_day,$to->int_month,$to->int_week_day);
-
-			$c = new Cron($ct,$to->command);
-			$result[$to->id]['task'] = $to;
-			$result[$to->id]['next'] = $c->next($to->date_run);
-		}
-
-		return $result;
-	}
-
-	public function list_next() {
-		$result = array();
-
-		foreach ($this->list_active() as $v)
-			if ((! $result OR $v['next']<$result['next']) AND ! $v['task']->running)
-				$result = $v;
-
-		return array($result['task']->id=>$result);
+		return $format ? Config::datetime($x) : $x;
 	}
 }
 ?>
diff --git a/modules/task/classes/Model/Task/Log.php b/modules/task/classes/Model/Task/Log.php
index 1ab89bb6..9da09ef4 100644
--- a/modules/task/classes/Model/Task/Log.php
+++ b/modules/task/classes/Model/Task/Log.php
@@ -10,6 +10,10 @@
  * @license    http://dev.osbill.net/license.html
  */
 class Model_Task_Log extends ORM_OSB {
+	protected $_sorting = array(
+		'id'=>'DESC',
+	);
+
 	protected $_belongs_to = array(
 		'task'=>array(),
 	);
diff --git a/modules/task/classes/Task/Task/Listactive.php b/modules/task/classes/Task/Task/Listactive.php
index e03bb4ce..deee9918 100644
--- a/modules/task/classes/Task/Task/Listactive.php
+++ b/modules/task/classes/Task/Task/Listactive.php
@@ -11,25 +11,20 @@
  */
 class Task_Task_Listactive extends Task {
 	protected function _execute(array $params) {
-		$output = '';
+		$header = "%2s %30s %21s %21s %40s\n";
 
-		$output .= sprintf('%2s %30s %21s %21s %40s',
-			'ID','Command','Last Run','Next Run','Description');
-		$output .= "\n";
+		$output = sprintf($header,'ID','Command','Last Run','Next Run','Description');
 
-		foreach (ORM::factory('Task')->list_active() as $t) {
-			$output .= sprintf('%2s %30s %21s %21s %40s',
-				$t['task']->id,
-				$t['task']->command,
-				$t['task']->display('date_run'),
-				Config::datetime($t['next']),
-				$t['task']->display('description')
+		foreach (ORM::factory('Task')->list_active() as $to)
+			$output .= sprintf($header,
+				$to->id,
+				$to->command,
+				$to->display('date_run'),
+				$to->next_run(TRUE),
+				$to->display('description')
 			);
 
-			$output .= "\n";
-		};
-
-		echo $output;
+		return $output;
 	}
 }
 ?>
diff --git a/modules/task/classes/Task/Task/Run.php b/modules/task/classes/Task/Task/Run.php
index f738cb65..2a330033 100644
--- a/modules/task/classes/Task/Task/Run.php
+++ b/modules/task/classes/Task/Task/Run.php
@@ -18,29 +18,85 @@ class Task_Task_Run extends Task {
 				if (! $to->status)
 					throw new Minion_Exception_InvalidTask('Task :task (:name) NOT active',array(':task'=>$params['id'],':name'=>$to->name));
 
-				if (! Kohana::$config->load('debug')->task_sim)
-					$to->run($params['force']);
-				else
-					printf('Would Run task: (%s) %s',$params['id'],$to->name);
-
-				echo "\n";
+				Kohana::$config->load('debug')->task_sim ? printf("Would Run task: (%s) %s\n",$to->id,$to->name) : $this->_run($to,$params['force']);
 
 			} else
 				throw new Minion_Exception_InvalidTask('Unknown task :task',array(':task'=>$params['id']));
 
 		} else {
-			$tlo = ORM::factory('Task');
 			$t = time();
 
-			foreach ($tlo->list_active() as $to)
-				if ($to['next'] < $t) {
-					if (! Kohana::$config->load('debug')->task_sim)
-						$to['task']->run();
-					else
-						printf('Would Run task: (%s) %s',$to['task']->id,$to['task']->name);
-						echo "\n";
-				}
+			foreach (ORM::factory('Task')->list_active() as $to)
+				if ($to->next_run() < $t)
+					Kohana::$config->load('debug')->task_sim ? printf("Would Run task: (%s) %s\n",$to->id,$to->name) : $this->_run($to);
 		}
 	}
+
+	private function _run(Model_Task $to,$force=FALSE) {
+		$r = rand(0,9999);
+		$tlo = ORM::factory('Task_Log');
+		$tlo->task_id = $to->id;
+
+		if ($to->running AND ! $force)
+			$tlo->message = sprintf('Task %s is already running',$to->id);
+
+		else {
+			try {
+				// Get a lock
+				$to->running = 1;
+				$to->running_host = $r;
+				$to->save();
+
+				// Check we are the winning host to run this task
+				// @todo We need to test that the lock is not stale
+				$to->reload();
+				if ($to->running_host != $r)
+					return;
+
+				switch ($to->type) {
+					case 1:
+						$r = Minion_Task::factory(array('site'=>Minion_CLI::options('site'),'task'=>$to->command))->execute();
+						$to->running = 0;
+						$to->running_host = NULL;
+
+						$tlo->message = $r;
+						$tlo->result = 0;
+
+						break;
+					case 0:
+						$r = Request::factory($to->command)->execute();
+
+						if ($r->status() == 200) {
+							$to->running = 0;
+							$to->running_host = NULL;
+						}
+
+						$tlo->message = $r->body();
+						$tlo->result = $r->status();
+
+						break;
+
+					default:
+						throw new Kohana_Exception('Unknown task type :type',array(':type'=>$to->type));
+				}
+
+				// Clear our lock and update the last run time
+				$to->date_run = time();
+
+
+			} catch (Exception $e) {
+				$tlo->result = $e->getCode();
+				$tlo->message = Kohana_Exception::text($e);
+
+				$to->running = 1;
+				$to->running_host = 'ERROR';
+			}
+
+			$to->save();
+		}
+
+		if ($to->log)
+			$tlo->save();
+	}
 }
 ?>