diff --git a/admin_cronjobs.php b/admin_cronjobs.php
index f2b5823d..942ad98d 100644
--- a/admin_cronjobs.php
+++ b/admin_cronjobs.php
@@ -35,11 +35,8 @@ if ($page == 'cronjobs' || $page == 'overview') {
 		);
 		$paging = new paging($userinfo, TABLE_PANEL_CRONRUNS, $fields);
 
-		/*
-		 * @TODO Fix sorting
-		 */
 		$crons = '';
-		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `cronfile` ASC");
+		$result_stmt = Database::prepare("SELECT `c`.* FROM `" . TABLE_PANEL_CRONRUNS . "` `c` ORDER BY `module` ASC, `cronfile` ASC");
 		Database::pexecute($result_stmt);
 		$paging->setEntries(Database::num_rows());
 		$sortcode = $paging->getHtmlSortCode($lng);
@@ -49,8 +46,14 @@ if ($page == 'cronjobs' || $page == 'overview') {
 
 		$i = 0;
 		$count = 0;
+		$cmod = '';
 
 		while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
+			if ($cmod != $row['module']) {
+				$module = ucfirst(explode("/", $row['module'])[1]);
+				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjobmodule') . "\";");
+				$cmod = $row['module'];
+			}
 			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
 
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index 54ebf984..8ee1190a 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2561,8 +2561,14 @@ if (isFroxlorVersion('0.9.31-rc2')) {
 	updateToVersion('0.9.31-rc3');
 }
 
+if (isFroxlorVersion('0.9.31-rc3')) {
+        showUpdateStep("Updating from 0.9.31-rc3 to 0.9.31 final", true);
+        lastStepStatus(0);
+        updateToVersion('0.9.31');
+}
+
 if (isFroxlorVersion('0.9.31')) {
-	
+
 	showUpdateStep("Updating from 0.9.31 to 0.9.32-dev1");
 	lastStepStatus(0);
 
diff --git a/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl b/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl
new file mode 100644
index 00000000..ddf741d8
--- /dev/null
+++ b/templates/Froxlor/admin/cronjobs/cronjobs_cronjobmodule.tpl
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="5"><b>{$module}</b></td>
+</tr>
diff --git a/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl b/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl
new file mode 100644
index 00000000..ddf741d8
--- /dev/null
+++ b/templates/Sparkle/admin/cronjobs/cronjobs_cronjobmodule.tpl
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="5"><b>{$module}</b></td>
+</tr>