diff --git a/js/main.js b/js/main.js
index 5b4ad680c7c5ed84e492d60ffd8cf5cb188d2a2b..7fd4c4efe9ffca2dcd3c41875b0e176b8407f8df 100644
--- a/js/main.js
+++ b/js/main.js
@@ -460,7 +460,7 @@ function editSubtask(subtask_ID, task_ID)
 	$.post('../admin/helper/edit-subtask.php',
 		{
 			"title": title,
-			"de6scription": description,
+			"description": description,
 			"done": done,
 			"edit": edit,
 			"ID": subtask_ID,
diff --git a/php/admin/admin-roadmaps.php b/php/admin/admin-roadmaps.php
index 3bef775208a27f15d83e3ba838f09ce5cf4884e1..0131651c1c5133edf4aff1ab85a540b48a14dde8 100644
--- a/php/admin/admin-roadmaps.php
+++ b/php/admin/admin-roadmaps.php
@@ -65,8 +65,7 @@ $db->createTables();
 
 								if($roadmaps == false)
 								{
-									header('Location: ../error.php?message=error_database_connection');
-									exit;
+									echo '<td colspan="2" class="center-align">No Roadmaps</td>';
 								}
 								else
 								{
diff --git a/php/index.php b/php/index.php
index 7d9ff78edbc742be89673137a143381654b113b0..546b225fe5b991f1ceaee43ae69efcb00b1492e7 100644
--- a/php/index.php
+++ b/php/index.php
@@ -271,7 +271,7 @@ function printMilestoneIndevWithTasks($currentMilestone, $db, $tasks, $color, $l
 	else
 	{
 		$numberOfOpenTasks = $numberOfOpenTasks['count'];
-		$percentage = ($numberOfOpenTasks / sizeof($tasks))*100;
+		$percentage = ((sizeof($tasks) - $numberOfOpenTasks) / sizeof($tasks))*100;
 		$percentage = round($percentage);
 
 		echo '<div class="card padding white milestone">' .
@@ -342,17 +342,17 @@ function printSubTasksDone($currentTask, $subtasks, $db)
 	else
 	{
 		$numberOfOpenSubtasks = $numberOfOpenSubtasks['count'];
-		if($numberOfOpenSubtasks == sizeof($subtasks))
+		if($numberOfOpenSubtasks == 0)
 		{
 			echo '<li>' .
-				'<div class="collapsible-header bold"><i class="material-icons green-text">check</i>Layout<span class="right">' . $numberOfOpenSubtasks . '/' . sizeof($subtasks) . '</span></div>' .
+				'<div class="collapsible-header bold"><i class="material-icons green-text">check</i>'.$currentTask['Title'].'<span class="right">' . (sizeof($subtasks) - $numberOfOpenSubtasks) . '/' . sizeof($subtasks) . '</span></div>' .
 				'<div class="collapsible-body">' .
 				'<ul class="collapsible white margin-left-and-right no-shadow margin-top-and-bottom" data-collapsible="accordion">';
 		}
 		else
 		{
 			echo '<li>' .
-				'<div class="collapsible-header bold"><i class="material-icons red-text">build</i>Layout<span class="right">' . $numberOfOpenSubtasks . '/' . sizeof($subtasks) . '</span></div>' .
+				'<div class="collapsible-header bold"><i class="material-icons red-text">build</i>'.$currentTask['Title'].'<span class="right">' . (sizeof($subtasks) - $numberOfOpenSubtasks) . '/' . sizeof($subtasks) . '</span></div>' .
 				'<div class="collapsible-body">' .
 				'<ul class="collapsible white margin-left-and-right no-shadow margin-top-and-bottom" data-collapsible="accordion">';
 		}