diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php
index c385b9a..2be487e 100644
--- a/Theme/Backend/task-analysis.tpl.php
+++ b/Theme/Backend/task-analysis.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -48,3 +48,11 @@ echo $this->getData('nav')->render(); ?>
         </table>
     </div>
 </section>
+
+<div class="clear"></div>
+
+<section class="box w-100 floatLeft">
+    <header><h1><?= $this->getText('History'); ?></h1></header>
+    <div class="inner" style="height: 300px">
+    </div>
+</section>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index da2938b..4486c3c 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -71,19 +71,23 @@ foreach ($elements as $key => $element) : $c++;
 
 <section class="box w-50">
     <div class="inner">
-        <form>
+        <form id="taskElementCreate" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/element?csrf={$CSRF}'); ?>">
             <table class="layout wf-100">
                 <tr><td><label for="iMessage"><?= $this->getText('Message'); ?></label>
-                <tr><td><textarea></textarea>
+                <tr><td><textarea id="iMessage" name="description"></textarea>
                 <tr><td><label for="iDue"><?= $this->getText('Due'); ?></label>
-                <tr><td><input type="datetime-local">
-                <tr><td><label for="iReceiver"><?= $this->getText('Status'); ?></label>
-                <tr><td><select>
-                            <option>
+                <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= end($elements)->getDue()->format('Y-m-d\TH:i:s'); ?>">
+                <tr><td><label for="iStatus"><?= $this->getText('Status'); ?></label>
+                <tr><td><select id="iStatus" name="status">
+                            <option value="<?= \Modules\Tasks\Models\TaskStatus::OPEN; ?>" selected>Open
+                            <option value="<?= \Modules\Tasks\Models\TaskStatus::WORKING; ?>">Working
+                            <option value="<?= \Modules\Tasks\Models\TaskStatus::SUSPENDED; ?>">Suspended
+                            <option value="<?= \Modules\Tasks\Models\TaskStatus::CANCELED; ?>">Canceled
+                            <option value="<?= \Modules\Tasks\Models\TaskStatus::DONE; ?>">Done
                         </select>
                 <tr><td><label for="iReceiver"><?= $this->getText('To'); ?></label>
-                <tr><td><input type="text" id="iReceiver" placeholder="&#xf007; Guest">
-                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="type" value="1">
+                <tr><td><input type="text" id="iReceiver" name="forward" value="<?= $this->request->getAccount(); ?>" placeholder="&#xf007; Guest">
+                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="task" value="<?= $this->request->getData('id') ?>"><input type="hidden" name="type" value="1">
             </table>
         </form>
     </div>
diff --git a/Theme/backend/task-create.tpl.php b/Theme/backend/task-create.tpl.php
index bba12a8..f8243dc 100644
--- a/Theme/backend/task-create.tpl.php
+++ b/Theme/backend/task-create.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD
@@ -22,19 +22,19 @@ echo $this->getData('nav')->render(); ?>
     <header><h1><?= $this->getText('Task'); ?></h1></header>
 
     <div class="inner">
-        <form id="fTask"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task/create'); ?>">
+        <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task?csrf={$CSRF}'); ?>">
             <table class="layout wf-100">
                 <tbody>
                 <tr><td colspan="2"><label for="iReceiver"><?= $this->getText('To'); ?></label>
-                <tr><td><span class="input"><button type="button" data-action='[{"type": "popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 5000}]' formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
+                <tr><td><span class="input"><button type="button" data-action='[{"listener": "click", "action": [{"type": "popup", "tpl": "acc-grp-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 5000}]}]' formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iReceiver" name="receiver" placeholder="&#xf007; Guest" required></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
                 <tr><td colspan="2"><label for="iObserver"><?= $this->getText('CC'); ?></label>
-                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest" required></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
+                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" min="1" id="iObserver" name="observer" placeholder="&#xf007; Guest"></span><td><button><?= $this->getText('Add', 0, 0); ?></button>
                 <tr><td colspan="2"><label for="iDue"><?= $this->getText('Due'); ?></label>
                 <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>"><td>
                 <tr><td colspan="2"><label for="iTitle"><?= $this->getText('Title'); ?></label>
-                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getText('Title'); ?>"><td>
+                <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getText('Title'); ?>" required><td>
                 <tr><td colspan="2"><label for="iMessage"><?= $this->getText('Message'); ?></label>
-                <tr><td><textarea id="iMessage" name="description" placeholder="&#xf040;"></textarea><td>
+                <tr><td><textarea id="iMessage" name="description" placeholder="&#xf040;" required></textarea><td>
                 <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><input type="hidden" name="type" value="<?= \Modules\Tasks\Models\TaskType::SINGLE; ?>">
             </table>
         </form>
diff --git a/Theme/backend/task-dashboard.tpl.php b/Theme/backend/task-dashboard.tpl.php
index a3da8f3..dd97c19 100644
--- a/Theme/backend/task-dashboard.tpl.php
+++ b/Theme/backend/task-dashboard.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Orange Management
  *
- * PHP Version 7.0
+ * PHP Version 7.1
  *
  * @category   TBD
  * @package    TBD