diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md
old mode 100644
new mode 100755
diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md
old mode 100644
new mode 100755
diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md
old mode 100644
new mode 100755
diff --git a/.github/user_feature_request.md b/.github/user_feature_request.md
old mode 100644
new mode 100755
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
old mode 100644
new mode 100755
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
old mode 100644
new mode 100755
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
old mode 100644
new mode 100755
diff --git a/Admin/Hooks/Web/Api.php b/Admin/Hooks/Web/Api.php
old mode 100644
new mode 100755
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
old mode 100644
new mode 100755
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
old mode 100644
new mode 100755
diff --git a/Admin/Install/db.json b/Admin/Install/db.json
old mode 100644
new mode 100755
diff --git a/Admin/Installer.php b/Admin/Installer.php
old mode 100644
new mode 100755
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
old mode 100644
new mode 100755
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
old mode 100644
new mode 100755
diff --git a/Admin/Status.php b/Admin/Status.php
old mode 100644
new mode 100755
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
old mode 100644
new mode 100755
diff --git a/Admin/Updater.php b/Admin/Updater.php
old mode 100644
new mode 100755
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
old mode 100644
new mode 100755
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
old mode 100644
new mode 100755
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
old mode 100644
new mode 100755
diff --git a/Controller/Controller.php b/Controller/Controller.php
old mode 100644
new mode 100755
diff --git a/Docs/Dev/en/SUMMARY.md b/Docs/Dev/en/SUMMARY.md
old mode 100644
new mode 100755
diff --git a/Docs/Dev/en/task.md b/Docs/Dev/en/task.md
old mode 100644
new mode 100755
diff --git a/Docs/Help/en/SUMMARY.md b/Docs/Help/en/SUMMARY.md
old mode 100644
new mode 100755
diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md
old mode 100644
new mode 100755
diff --git a/Docs/Help/en/task.md b/Docs/Help/en/task.md
old mode 100644
new mode 100755
diff --git a/LICENSE.txt b/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/Models/AccountRelation.php b/Models/AccountRelation.php
old mode 100644
new mode 100755
diff --git a/Models/AccountRelationMapper.php b/Models/AccountRelationMapper.php
old mode 100644
new mode 100755
diff --git a/Models/DutyType.php b/Models/DutyType.php
old mode 100644
new mode 100755
diff --git a/Models/GroupRelation.php b/Models/GroupRelation.php
old mode 100644
new mode 100755
diff --git a/Models/GroupRelationMapper.php b/Models/GroupRelationMapper.php
old mode 100644
new mode 100755
diff --git a/Models/NullTask.php b/Models/NullTask.php
old mode 100644
new mode 100755
diff --git a/Models/NullTaskElement.php b/Models/NullTaskElement.php
old mode 100644
new mode 100755
diff --git a/Models/PermissionState.php b/Models/PermissionState.php
old mode 100644
new mode 100755
diff --git a/Models/RelationAbstract.php b/Models/RelationAbstract.php
old mode 100644
new mode 100755
diff --git a/Models/Task.php b/Models/Task.php
old mode 100644
new mode 100755
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
old mode 100644
new mode 100755
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
old mode 100644
new mode 100755
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
old mode 100644
new mode 100755
diff --git a/Models/TaskPriority.php b/Models/TaskPriority.php
old mode 100644
new mode 100755
diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php
old mode 100644
new mode 100755
diff --git a/Models/TaskTemplate.php b/Models/TaskTemplate.php
old mode 100644
new mode 100755
diff --git a/Models/TaskType.php b/Models/TaskType.php
old mode 100644
new mode 100755
diff --git a/Models/TaskVisibility.php b/Models/TaskVisibility.php
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/ListView.php b/Theme/Backend/Components/Tasks/ListView.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/PriorityView.php b/Theme/Backend/Components/Tasks/PriorityView.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/StatusView.php b/Theme/Backend/Components/Tasks/StatusView.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/priority.tpl.php b/Theme/Backend/Components/Tasks/priority.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Components/Tasks/status.tpl.php b/Theme/Backend/Components/Tasks/status.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css
old mode 100644
new mode 100755
index 96136e0..0fc8787
--- a/Theme/Backend/css/styles.css
+++ b/Theme/Backend/css/styles.css
@@ -8,10 +8,12 @@
 
 .tag.task-status-1 {
     background: #ff6250;
+    color: #fff;
 }
 
 .tag.task-status-2 {
     background: #3498db;
+    color: #fff;
 }
 
 .tag.task-status-3 {
@@ -20,6 +22,7 @@
 
 .tag.task-status-4 {
     background: #9b59b6;
+    color: #fff;
 }
 
 .tag.task-status-5 {
diff --git a/Theme/Backend/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php
old mode 100644
new mode 100755
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
old mode 100644
new mode 100755
index 830dcc8..fd86069
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -29,16 +29,16 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="row">
     <div class="col-md-6 col-xs-12">
-        <div id="task" class="portlet"
+        <section id="task" class="portlet"
             data-update-content="#task"
-            data-update-element="#task .portlet-head, #task .task-content"
+            data-update-element="#task .task-title, #task .task-content"
             data-update-tpl="#headTpl, #contentTpl"
             data-tag="form"
             data-method="POST"
             data-uri="<?= \phpOMS\Uri\UriFactory::build('{/api}task?id={?id}&csrf={$CSRF}'); ?>">
             <?php if ($task->isEditable()) : ?>
                 <template id="headTpl">
-                    <div class="portlet-head"><input type="text" data-tpl-text="/title" data-tpl-value="/title" data-value="" name="title"></div>
+                    <h1 class="task-title"><input type="text" data-tpl-text="/title" data-tpl-value="/title" data-value="" name="title" autocomplete="off"></h1>
                 </template>
                 <template id="contentTpl">
                     <div class="task-content">
@@ -54,14 +54,25 @@ echo $this->getData('nav')->render(); ?>
                     </div>
                 </template>
             <?php endif; ?>
-            <div class="portlet-head" data-tpl-text="/title" data-tpl-value="/title" data-value=""><?= $this->printHtml($task->getTitle()); ?></div>
-            <div class="portlet-body">
-                <span id="task-status-badge" class="floatRight nobreak tag task-status-<?= $this->printHtml($task->getStatus()); ?>">
-                    <?= $this->getHtml('S' . $task->getStatus()) ?>
-                </span>
-                <div>
-                    <?= $this->printHtml($task->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($task->getCreatedAt()->format('Y/m/d H:i')); ?>
+            <div class="portlet-head">
+                <div class="row middle-xs">
+                    <span class="col-xs-0">
+                        <img class="profile-image" alt="<?= $this->getHtml('User', '0', '0'); ?>" data-lazyload="<?= $this->getAccountImage($task->getCreatedBy()); ?>">
+                    </span>
+                    <span>
+                        <?= $this->printHtml($task->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($task->getCreatedAt()->format('Y/m/d H:i')); ?>
+                    </span>
+                    <span class="col-xs end-xs plain-grid">
+                        <span id="task-status-badge" class="nobreak tag task-status-<?= $this->printHtml($task->getStatus()); ?>">
+                            <?= $this->getHtml('S' . $task->getStatus()) ?>
+                        </span>
+                    </span>
                 </div>
+            </div>
+            <div class="portlet-body">
+                <span class="task-title" data-tpl-text="/title" data-tpl-value="/title" data-value="">
+                    <?= $this->printHtml($task->getTitle()); ?>
+                </span>
                 <article class="task-content"
                     data-tpl-text="{/base}/api/task?id={?id}"
                     data-tpl-value="{/base}/api/task?id={?id}"
@@ -69,37 +80,38 @@ echo $this->getData('nav')->render(); ?>
                     data-tpl-text-path="/0/response/description"
                     data-value=""
                     ><?= $task->getDescription(); ?></article>
-
-                <?php if (!empty($taskMedia)) : ?>
-                    <div class="inner">
-                        <?php foreach ($taskMedia as $media) : ?>
-                            <span><?= $media->getName(); ?></span>
-                        <?php endforeach; ?>
-                    </div>
-                <?php endif; ?>
             </div>
-            <?php if ($task->isEditable()) : ?>
-            <div class="portlet-foot">
-                <div class="pAlignTable">
-                    <div class="vC wf-100">
-                        <?php if ($task->getPriority() === TaskPriority::NONE) : ?>
-                            <?= $this->getHtml('Due') ?>: <?= $this->printHtml($task->getDue()->format('Y/m/d H:i')); ?>
-                        <?php else : ?>
-                            <?= $this->getHtml('Priority') ?>: <?= $this->getHtml('P' . $task->getPriority()) ?>
+            <div class="portlet-foot row">
+                <div class="row col-xs plain-grid">
+                    <div class="col-xs">
+                        <?php if (!empty($taskMedia)) : ?>
+                            <div>
+                                <?php foreach ($taskMedia as $media) : ?>
+                                    <span><?= $media->getName(); ?></span>
+                                <?php endforeach; ?>
+                            </div>
+                        <?php endif; ?>
+
+                        <div>
+                            <?php if ($task->getPriority() === TaskPriority::NONE) : ?>
+                                <?= $this->getHtml('Due') ?>: <?= $this->printHtml($task->getDue()->format('Y/m/d H:i')); ?>
+                            <?php else : ?>
+                                <?= $this->getHtml('Priority') ?>: <?= $this->getHtml('P' . $task->getPriority()) ?>
+                            <?php endif; ?>
+                        </div>
+                    </div>
+                    <div class="col-xs-0 end-xs plain-grid">
+                        <?php if ($task->isEditable() && $this->request->getHeader()->getAccount() === $task->getCreatedBy()->getId()) : ?>
+                            <div class="col-xs end-xs plain-grid">
+                                <button class="save hidden"><?= $this->getHtml('Save', '0', '0') ?></button>
+                                <button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0') ?></button>
+                                <button class="update"><?= $this->getHtml('Edit', '0', '0') ?></button>
+                            </div>
                         <?php endif; ?>
                     </div>
-
-                    <?php if ($task->isEditable() && $this->request->getHeader()->getAccount() === $task->getCreatedBy()->getId()) : ?>
-                        <div class="vC">
-                            <button class="save hidden"><?= $this->getHtml('Save', '0', '0') ?></button>
-                            <button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0') ?></button>
-                            <button class="update"><?= $this->getHtml('Edit', '0', '0') ?></button>
-                        </div>
-                    <?php endif; ?>
                 </div>
             </div>
-            <?php endif; ?>
-        </div>
+        </section>
 
         <div id="elements">
             <template id="elementTpl">
@@ -158,67 +170,73 @@ echo $this->getData('nav')->render(); ?>
             <?php endif; ?>
             <?php $c = 0; $previous = null;
             foreach ($elements as $key => $element) : ++$c;
-                if ($element->getDescription() !== '') :
-            ?>
-                <section id="taskelmenet-<?= $c; ?>" class="box wf-100 taskElement"
+                if ($element->getDescription() !== '') : ?>
+                <section id="taskelmenet-<?= $c; ?>" class="portlet taskElement"
                     data-update-content="#elements"
                     data-update-element=".taskElement .taskElement-content"
                     data-tag="form"
                     data-method="POST"
                     data-uri="<?= \phpOMS\Uri\UriFactory::build('{/api}task/element?{?}&csrf={$CSRF}'); ?>">
-                    <div class="inner pAlignTable">
-                        <div class="vC wf-100">
-                            <?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
+                    <div class="portlet-head">
+                        <div class="row middle-xs">
+                            <span class="col-xs-0">
+                                <img class="profile-image" alt="<?= $this->getHtml('User', '0', '0'); ?>" data-lazyload="<?= $this->getAccountImage($element->getCreatedBy()); ?>">
+                            </span>
+                            <span class="col-xs">
+                                <?= $this->printHtml($element->getCreatedBy()->getName1()); ?> - <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
+                            </span>
+                            <span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>">
+                                <?= $this->getHtml('S' . $element->getStatus()) ?>
+                            </span>
                         </div>
-                        <span class="vC tag task-status-<?= $this->printHtml($element->getStatus()); ?>">
-                            <?= $this->getHtml('S' . $element->getStatus()) ?>
-                        </span>
                     </div>
 
                     <?php if ($element->getDescription() !== '') : ?>
-                        <div class="inner taskElement-content">
+                        <div class="portlet-body taskElement-content">
                             <article data-tpl-text="/content" data-tpl-value="{/api}task/element?id={?id}" data-tpl-value-path="/0/response/description" data-value=""><?= $element->getDescription(); ?></article>
                         </div>
                     <?php endif; ?>
 
-                    <?php $elementMedia = $element->getMedia(); if (!empty($elementMedia)) : ?>
-                    <div class="inner">
-                        <?php foreach ($elementMedia as $media) : ?>
-                            <span><?= $media->getName(); ?></span>
-                        <?php endforeach; ?>
-                    </div>
-                    <?php endif; ?>
 
-                    <div class="inner pAlignTable" style="background: #efefef; border-top: 1px solid #dfdfdf;">
-                    <?php if ($element->getStatus() !== TaskStatus::CANCELED
-                        || $element->getStatus() !== TaskStatus::DONE
-                        || $element->getStatus() !== TaskStatus::SUSPENDED
-                        || $c != $cElements
-                    ) : ?>
-                        <div class="vC wf-100 nobreak">
-                            <?php
-                                if ($element->getPriority() === TaskPriority::NONE
-                                    && ($previous !== null
-                                        && $previous->getDue()->format('Y/m/d H:i') !== $element->getDue()->format('Y/m/d H:i')
-                                    )
-                                ) : ?>
-                                <?= $this->getHtml('Due') ?>: <?= $this->printHtml($element->getDue()->format('Y/m/d H:i')); ?>
-                            <?php elseif ($previous !== null && $previous->getPriority() !== $element->getPriority()) : ?>
-                                <?= $this->getHtml('Priority') ?>: <?= $this->getHtml('P' . $element->getPriority()) ?>
-                            <?php endif; ?>
-                        </div>
-                    <?php endif; ?>
+                    <div class="portlet-foot row middle-xs">
+                        <?php $elementMedia = $element->getMedia();
+                        if (!empty($elementMedia)) : ?>
+                            <div>
+                                <?php foreach ($elementMedia as $media) : ?>
+                                    <span><?= $media->getName(); ?></span>
+                                <?php endforeach; ?>
+                            </div>
+                        <?php endif; ?>
 
-                    <?php if ($task->isEditable()
-                        && $this->request->getHeader()->getAccount() === $element->getCreatedBy()->getId()
-                    ) : ?>
-                        <div class="vC">
-                            <input type="hidden" value="<?= $element->getId(); ?>" name="id">
-                            <button class="save hidden"><?= $this->getHtml('Save', '0', '0') ?></button>
-                            <button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0') ?></button>
-                            <button class="update"><?= $this->getHtml('Edit', '0', '0') ?></button>
-                        </div>
-                    <?php endif; ?>
+                        <?php if ($element->getStatus() !== TaskStatus::CANCELED
+                            || $element->getStatus() !== TaskStatus::DONE
+                            || $element->getStatus() !== TaskStatus::SUSPENDED
+                            || $c != $cElements
+                        ) : ?>
+                            <div>
+                                <?php
+                                    if ($element->getPriority() === TaskPriority::NONE
+                                        && ($previous !== null
+                                            && $previous->getDue()->format('Y/m/d H:i') !== $element->getDue()->format('Y/m/d H:i')
+                                        )
+                                    ) : ?>
+                                    <?= $this->getHtml('Due') ?>: <?= $this->printHtml($element->getDue()->format('Y/m/d H:i')); ?>
+                                <?php elseif ($previous !== null && $previous->getPriority() !== $element->getPriority()) : ?>
+                                    <?= $this->getHtml('Priority') ?>: <?= $this->getHtml('P' . $element->getPriority()) ?>
+                                <?php endif; ?>
+                            </div>
+                        <?php endif; ?>
+
+                        <?php if ($task->isEditable()
+                            && $this->request->getHeader()->getAccount() === $element->getCreatedBy()->getId()
+                        ) : ?>
+                            <div class="col-xs end-xs plain-grid">
+                                <input type="hidden" value="<?= $element->getId(); ?>" name="id">
+                                <button class="save hidden"><?= $this->getHtml('Save', '0', '0') ?></button>
+                                <button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0') ?></button>
+                                <button class="update"><?= $this->getHtml('Edit', '0', '0') ?></button>
+                            </div>
+                        <?php endif; ?>
                 </section>
                 <?php endif; ?>
 
diff --git a/Views/TaskView.php b/Views/TaskView.php
old mode 100644
new mode 100755
index 69230b8..4e7038d
--- a/Views/TaskView.php
+++ b/Views/TaskView.php
@@ -16,6 +16,9 @@ namespace Modules\Tasks\Views;
 
 use Modules\Tasks\Models\TaskStatus;
 use phpOMS\Views\View;
+use phpOMS\Uri\UriFactory;
+use Modules\Admin\Models\Account;
+use Modules\Profile\Models\ProfileMapper;
 
 /**
  * Task view class.
@@ -27,6 +30,28 @@ use phpOMS\Views\View;
  */
 class TaskView extends View
 {
+    /**
+     * Get the profile image
+     *
+     * If the profile doesn't have an image a random default image is used
+     *
+     * @param Account $account Account
+     *
+     * @return string
+     *
+     * @since 1.0.0
+     */
+    public function getAccountImage(Account $account) : string
+    {
+        $profile = ProfileMapper::getFor($account->getId(), 'account');
+
+        if ($profile === null || $profile->getImage()->getPath() === '') {
+            return UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) . '.png');
+        }
+
+        return UriFactory::build($profile->getImage()->getPath());
+    }
+
     /**
      * Get task status color.
      *
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
diff --git a/composer.lock b/composer.lock
old mode 100644
new mode 100755
diff --git a/img/module_teaser_small.png b/img/module_teaser_small.png
old mode 100644
new mode 100755
diff --git a/info.json b/info.json
old mode 100644
new mode 100755
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
old mode 100644
new mode 100755
diff --git a/tests/BackendControllerTest.php b/tests/BackendControllerTest.php
old mode 100644
new mode 100755
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/AccountRelationTest.php b/tests/Models/AccountRelationTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/GroupRelationTest.php b/tests/Models/GroupRelationTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/TaskElementTest.php b/tests/Models/TaskElementTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/TaskMapperTest.php b/tests/Models/TaskMapperTest.php
old mode 100644
new mode 100755
diff --git a/tests/Models/TaskTest.php b/tests/Models/TaskTest.php
old mode 100644
new mode 100755
diff --git a/tests/Tasks.side b/tests/Tasks.side
old mode 100644
new mode 100755