diff --git a/Theme/backend/task-create.tpl.php b/Theme/backend/task-create.tpl.php
index f8243dc..fcef0d1 100644
--- a/Theme/backend/task-create.tpl.php
+++ b/Theme/backend/task-create.tpl.php
@@ -18,43 +18,49 @@
  */
 echo $this->getData('nav')->render(); ?>
 
-<section class="box w-50 floatLeft">
-    <header><h1><?= $this->getText('Task'); ?></h1></header>
+<div class="row">
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $this->getText('Task'); ?></h1></header>
 
-    <div class="inner">
-        <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='[{"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"></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'); ?>" required><td>
-                <tr><td colspan="2"><label for="iMessage"><?= $this->getText('Message'); ?></label>
-                <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>
+            <div class="inner">
+                <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='[{"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"></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'); ?>" required><td>
+                        <tr><td colspan="2"><label for="iMessage"><?= $this->getText('Message'); ?></label>
+                        <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>
+            </div>
+        </section>
     </div>
-</section>
 
-<section class="box w-50 floatLeft">
-    <header><h1><?= $this->getText('Media'); ?></h1></header>
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $this->getText('Media'); ?></h1></header>
 
-    <div class="inner">
-        <form>
-            <table class="layout wf-100">
-                <tbody>
-                <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
-                <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
-                <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
-                <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
-            </table>
-        </form>
+            <div class="inner">
+                <form>
+                    <table class="layout wf-100">
+                        <tbody>
+                        <tr><td colspan="2"><label for="iMedia"><?= $this->getText('Media'); ?></label>
+                        <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getText('Select'); ?></button>
+                        <tr><td colspan="2"><label for="iUpload"><?= $this->getText('Upload'); ?></label>
+                        <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                    </table>
+                </form>
+            </div>
+        </section>
     </div>
-</section>
+</div>
 
 <?php include ROOT_PATH . '/Modules/Profile/Theme/Backend/acc-grp-popup.tpl.php'; ?>
\ No newline at end of file
diff --git a/Theme/backend/task-single.tpl.php b/Theme/backend/task-single.tpl.php
index 4486c3c..39307a0 100644
--- a/Theme/backend/task-single.tpl.php
+++ b/Theme/backend/task-single.tpl.php
@@ -23,72 +23,76 @@ $cElements = count($elements);
 
 echo $this->getData('nav')->render(); ?>
 
-<section class="box w-50">
-    <header><h1><?= $task->getTitle(); ?></h1></header>
-    <div class="inner">
-        <div class="floatRight">Due <?= $task->getDue()->format('Y-m-d H:i'); ?></div>
-        <div>Created <?= $task->getCreatedAt()->format('Y-m-d H:i'); ?></div>
-        <blockquote>
-            <?= $task->getDescription(); ?>
-        </blockquote>
-        <div>Created <?= $task->getCreatedBy(); ?></div>
-        <div>Status <?= $task->getStatus(); ?></div>
-    </div>
-</section>
-
-<?php $c = 0;
-foreach ($elements as $key => $element) : $c++;
-    if($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
-    elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-    elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-    elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-    elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
-    <section class="box w-50">
-        <div class="floatRight"><span class="tag <?= $color; ?>"><?= $this->getText('S' . $element->getStatus()); ?></span></div>
-        <div><?= $element->getCreatedBy(); ?> - <?= $element->getCreatedAt()->format('Y-m-d H:i'); ?></div>
-    </section>
-    <?php if ($element->getDescription() !== '') : ?>
-        <section class="box w-50">
+<div class="row">
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $task->getTitle(); ?></h1></header>
             <div class="inner">
+                <div class="floatRight">Due <?= $task->getDue()->format('Y-m-d H:i'); ?></div>
+                <div>Created <?= $task->getCreatedAt()->format('Y-m-d H:i'); ?></div>
                 <blockquote>
-                    <?= $element->getDescription(); ?>
+                    <?= $task->getDescription(); ?>
                 </blockquote>
+                <div>Created <?= $task->getCreatedBy(); ?></div>
+                <div>Status <?= $task->getStatus(); ?></div>
             </div>
         </section>
-    <?php endif; ?>
-    <section class="box w-50">
-        <?php if ($element->getStatus() !== \Modules\Tasks\Models\TaskStatus::CANCELED ||
-            $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::DONE ||
-            $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::SUSPENDED || $c != $cElements
-        ) : ?>
-            <div class="floatRight">Due <?= $element->getDue()->format('Y-m-d H:i'); ?></div>
-        <?php endif; ?>
-        <?php if ($element->getForwarded() !== 0) : ?>
-            <div>Forwarded <?= $element->getForwarded(); ?></div>
-        <?php endif; ?>
-    </section>
-<?php endforeach; ?>
 
-<section class="box w-50">
-    <div class="inner">
-        <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 id="iMessage" name="description"></textarea>
-                <tr><td><label for="iDue"><?= $this->getText('Due'); ?></label>
-                <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" 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>
+        <?php $c = 0;
+        foreach ($elements as $key => $element) : $c++;
+            if($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
+            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
+            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
+            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
+            elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
+            <section class="box wf-100">
+                <div class="floatRight"><span class="tag <?= $color; ?>"><?= $this->getText('S' . $element->getStatus()); ?></span></div>
+                <div><?= $element->getCreatedBy(); ?> - <?= $element->getCreatedAt()->format('Y-m-d H:i'); ?></div>
+            </section>
+            <?php if ($element->getDescription() !== '') : ?>
+                <section class="box wf-100">
+                    <div class="inner">
+                        <blockquote>
+                            <?= $element->getDescription(); ?>
+                        </blockquote>
+                    </div>
+                </section>
+            <?php endif; ?>
+            <section class="box wf-100">
+                <?php if ($element->getStatus() !== \Modules\Tasks\Models\TaskStatus::CANCELED ||
+                    $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::DONE ||
+                    $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::SUSPENDED || $c != $cElements
+                ) : ?>
+                    <div class="floatRight">Due <?= $element->getDue()->format('Y-m-d H:i'); ?></div>
+                <?php endif; ?>
+                <?php if ($element->getForwarded() !== 0) : ?>
+                    <div>Forwarded <?= $element->getForwarded(); ?></div>
+                <?php endif; ?>
+            </section>
+        <?php endforeach; ?>
+
+        <section class="box wf-100">
+            <div class="inner">
+                <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 id="iMessage" name="description"></textarea>
+                        <tr><td><label for="iDue"><?= $this->getText('Due'); ?></label>
+                        <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" 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>
+        </section>
     </div>
-</section>
+</div>