diff --git a/lang/en_us.php b/lang/en_us.php
index 472dd20..f5f04ab 100644
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -75,4 +75,5 @@ define("STRINGS", [
     "task deleted" => "Task deleted.",
     "finished on" => "Finished on: {date}",
     "started on" => "Started on: {date}",
+    "add task" => "Add Task"
 ]);
\ No newline at end of file
diff --git a/pages/edittask.php b/pages/edittask.php
index 16467df..2389f9e 100644
--- a/pages/edittask.php
+++ b/pages/edittask.php
@@ -3,65 +3,81 @@ require_once __DIR__ . '/../required.php';
 
 redirectifnotloggedin();
 ?>
-<h1 class="page-header"><?php lang("edit task") ?></h1>
-<?php
-include_once __DIR__ . "/../lib/userinfo.php";
-include_once __DIR__ . "/../lib/manage.php";
+<div class="panel panel-blue">
+    <div class="panel-heading">
+        <h3 class="panel-title">
+            <i class="fa fa-pencil-square-o"></i> <?php
+            if (is_empty($VARS['taskid'])) {
+                lang("add task");
+            } else {
+                lang("edit task");
+            }
+            ?>
+        </h3>
+    </div>
 
-if (!is_empty($VARS['taskid'])) {
-    $taskid = $VARS['taskid'];
+    <?php
+    include_once __DIR__ . "/../lib/userinfo.php";
+    include_once __DIR__ . "/../lib/manage.php";
 
-    $managed_uids = getManagedUIDs($_SESSION['uid']);
-    // There needs to be at least one entry otherwise the SQL query craps itself
-    if (count($managed_uids) < 1) {
-        $managed_uids = [-1];
+    if (!is_empty($VARS['taskid'])) {
+        $taskid = $VARS['taskid'];
+
+        $managed_uids = getManagedUIDs($_SESSION['uid']);
+        // There needs to be at least one entry otherwise the SQL query craps itself
+        if (count($managed_uids) < 1) {
+            $managed_uids = [-1];
+        }
+        $allowed = $database->has('tasks', [
+            '[>]assigned_tasks' => [
+                'taskid' => 'taskid'
+            ]
+                ], [
+            "AND" => [
+                "OR" => [
+                    'tasks.taskcreatoruid' => $_SESSION['uid'],
+                    'assigned_tasks.userid' => $managed_uids
+                ],
+                "tasks.taskid" => $taskid
+        ]]);
+
+        if (!$allowed) {
+            header("Location: app.php?page=edittask&msg=task_edit_not_allowed");
+            die(lang("task edit not allowed", false));
+        }
     }
-    $allowed = $database->has('tasks', [
-        '[>]assigned_tasks' => [
-            'taskid' => 'taskid'
-        ]
-            ], [
-        "AND" => [
-            "OR" => [
-                'tasks.taskcreatoruid' => $_SESSION['uid'],
-                'assigned_tasks.userid' => $managed_uids
-            ],
-            "tasks.taskid" => $taskid
-    ]]);
 
-    if (!$allowed) {
-        header("Location: app.php?page=edittask&msg=task_edit_not_allowed");
-        die(lang("task edit not allowed", false));
+    if (!is_empty($taskid)) {
+        $task = $database->select('tasks', '*', ['taskid' => $taskid])[0];
     }
-}
-
-if (!is_empty($taskid)) {
-    $task = $database->select('tasks', '*', ['taskid' => $taskid])[0];
-}
-if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid])) {
-    $tass = $database->select('assigned_tasks', '*', ['taskid' => $taskid])[0];
-} else {
-    $tass['userid'] = null;
-}
-?>
-<form action="action.php" method="GET" onsubmit="prettysave();">
-    <input type="hidden" name="action" value="edittask" />
-    <?php if (!is_empty($taskid)) { ?>
-        <input type="hidden" name="taskid" value="<?php echo $taskid; ?>" />
-    <?php } ?>
-    <?php lang("task title") ?>: <input type="text" name="tasktitle" placeholder="<?php lang("task title") ?>" required="required" class="form-control" value="<?php echo $task['tasktitle']; ?>"/>
-    <br />
-    <?php lang("task description") ?>:<br />
-    <textarea name="taskdesc" id="taskdesc" class="form-control"><?php echo $task['taskdesc']; ?></textarea>
-    <br />
-    <?php lang("assigned to") ?>: 
-    <input type="text" id="assigned-to-box" name="assignedto" class="form-control" autocomplete="off" value="<?php echo (is_null($tass['userid']) ? "" : getUserByID($tass['userid'])['username'] ); ?>" placeholder="<?php lang("nobody") ?>" />
-    <br />
-    <?php lang("assigned on 2") ?>: <input type="datetime-local" class="form-control" id="assigned-on-box" name="taskassignedon" value="<?php echo (is_empty($task['taskassignedon']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskassignedon']))); ?>" />
-    <!--<p><i class="fa fa-info-circle"></i> <?php lang("use now tip") ?></p>-->
-    <br />
-    <?php lang("due by 2") ?>: <input type="datetime-local" class="form-control" id="due-by-box" name="taskdueby" value="<?php echo (is_empty($task['taskdueby']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskdueby']))); ?>"/>
-    <br />
-    <button id="savebtn" type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> <?php lang("save task") ?></button>
-    <a class="btn btn-warning" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
-</form>
+    if (!is_empty($taskid) && $database->has('assigned_tasks', ['taskid' => $taskid])) {
+        $tass = $database->select('assigned_tasks', '*', ['taskid' => $taskid])[0];
+    } else {
+        $tass['userid'] = null;
+    }
+    ?>
+    <form action="action.php" method="GET" onsubmit="prettysave();">
+        <div class="panel-body">
+            <input type="hidden" name="action" value="edittask" />
+            <?php if (!is_empty($taskid)) { ?>
+                <input type="hidden" name="taskid" value="<?php echo $taskid; ?>" />
+            <?php } ?>
+            <?php lang("task title") ?>: <input type="text" name="tasktitle" placeholder="<?php lang("task title") ?>" required="required" class="form-control" value="<?php echo $task['tasktitle']; ?>"/>
+            <br />
+            <?php lang("task description") ?>:<br />
+            <textarea name="taskdesc" id="taskdesc" class="form-control"><?php echo $task['taskdesc']; ?></textarea>
+            <br />
+            <?php lang("assigned to") ?>: 
+            <input type="text" id="assigned-to-box" name="assignedto" class="form-control" autocomplete="off" value="<?php echo (is_null($tass['userid']) ? "" : getUserByID($tass['userid'])['username'] ); ?>" placeholder="<?php lang("nobody") ?>" />
+            <br />
+            <?php lang("assigned on 2") ?>: <input type="datetime-local" class="form-control" id="assigned-on-box" name="taskassignedon" value="<?php echo (is_empty($task['taskassignedon']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskassignedon']))); ?>" />
+            <!--<p><i class="fa fa-info-circle"></i> <?php lang("use now tip") ?></p>-->
+            <br />
+            <?php lang("due by 2") ?>: <input type="datetime-local" class="form-control" id="due-by-box" name="taskdueby" value="<?php echo (is_empty($task['taskdueby']) ? "" : date('o-m-d\TH:i:s', strtotime($task['taskdueby']))); ?>"/>
+        </div>
+        <div class="panel-footer">
+            <button id="savebtn" type="submit" class="btn btn-success"><i class="fa fa-floppy-o"></i> <?php lang("save task") ?></button>
+            <a class="btn btn-warning pull-right" href="app.php?page=taskman"><i class="fa fa-times"></i> <?php lang("exit") ?></a>
+        </div>
+    </form>
+</div>
diff --git a/pages/home.php b/pages/home.php
index b822b60..06dd7eb 100644
--- a/pages/home.php
+++ b/pages/home.php
@@ -5,13 +5,31 @@ redirectifnotloggedin();
 ?>
 <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-        <?php
-        include __DIR__ . '/mytasks.php';
-        ?>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">
+                    <i class="fa fa-th-list"></i> <?php lang("my tasks") ?>
+                </h3>
+            </div>
+            <div class="panel-body">
+                <?php
+                include __DIR__ . '/mytasks.php';
+                ?>
+            </div>
+        </div>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-        <?php
-        include __DIR__ . '/messages.php';
-        ?>
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <h3 class="panel-title">
+                    <i class="fa fa-comments"></i> <?php lang("messages") ?>
+                </h3>
+            </div>
+            <div class="panel-body">
+                <?php
+                include __DIR__ . '/messages.php';
+                ?>
+            </div>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/pages/messages.php b/pages/messages.php
index f32d2b5..b66dd68 100644
--- a/pages/messages.php
+++ b/pages/messages.php
@@ -3,9 +3,6 @@ require_once __DIR__ . '/../required.php';
 
 redirectifnotloggedin();
 ?>
-<h2 class="page-header">
-    <?php lang("messages") ?>
-</h2>
 <form action="action.php" method="POST" class="form-horizontal" id="msgsendform">
     <input type="hidden" name="action" value="sendmsg" />
     <div class="form-group">
diff --git a/pages/mytasks.php b/pages/mytasks.php
index b0962a9..05ba245 100644
--- a/pages/mytasks.php
+++ b/pages/mytasks.php
@@ -3,7 +3,6 @@ require_once __DIR__ . '/../required.php';
 
 redirectifnotloggedin();
 ?>
-<h2 class="page-header"><?php lang("my tasks") ?></h2>
 <div id="tasksdispdiv" class="row<?php
 if ($pageid != "mytasks") {
     echo ' home-list-container"';
diff --git a/pages/taskman.php b/pages/taskman.php
index ab0299a..06db514 100644
--- a/pages/taskman.php
+++ b/pages/taskman.php
@@ -3,9 +3,8 @@ require_once __DIR__ . '/../required.php';
 
 redirectifnotloggedin();
 ?>
-<h1 class="page-header"><?php lang("task manager") ?></h1>
-<div class="well well-sm">
-    <a href="app.php?page=edittask" class="btn btn-primary"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
+<div class="btn-group mgn-btm-10px">
+    <a href="app.php?page=edittask" class="btn btn-success"><i class="fa fa-plus"></i> <?php lang("new task") ?></a>
 </div>
 <div id="tasksdispdiv" class="row<?php
 if ($pageid != "taskman") {