diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index 7d880a3..1baae08 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -23,28 +23,28 @@ echo $this->getData('nav')->render(); ?>
 
             <div class="inner">
                 <form id="fTask" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/task?{?}&csrf={$CSRF}'); ?>">
-                    <table class="layout wf-100">
+                    <table class="layout wf-100" style="table-layout: fixed">
                         <tbody>
-                        <tr><td colspan="2"><label for="iReceiver"><?= $this->getHtml('To') ?></label>
-                        <tr><td><?= $this->getData('accGrpSelector')->render('iReceiver', true); ?><td><button><?= $this->getHtml('Add', 0, 0); ?></button>
-                        <tr><td colspan="2"><label for="iObserver"><?= $this->getHtml('CC') ?></label>
-                        <tr><td><?= $this->getData('accGrpSelector')->render('iCC', false); ?><td><button><?= $this->getHtml('Add', 0, 0); ?></button>
-                        <tr><td colspan="2"><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
+                        <tr><td><label for="iReceiver"><?= $this->getHtml('To') ?></label>
+                        <tr><td><?= $this->getData('accGrpSelector')->render('iReceiver', true); ?>
+                        <tr><td><label for="iObserver"><?= $this->getHtml('CC') ?></label>
+                        <tr><td><?= $this->getData('accGrpSelector')->render('iCC', false); ?>
+                        <tr><td><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
                         <tr><td><select id="iPriority" name="priority">
                                 <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VLOW); ?>"><?= $this->getHtml('P1') ?>
                                 <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::LOW); ?>"><?= $this->getHtml('P2') ?>
                                 <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::MEDIUM); ?>" selected><?= $this->getHtml('P3') ?>
                                 <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::HIGH); ?>"><?= $this->getHtml('P4') ?>
                                 <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VHIGH); ?>"><?= $this->getHtml('P5') ?>
-                            </select><td>
-                        <tr><td colspan="2"><label for="iDue"><?= $this->getHtml('Due') ?></label>
-                        <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>"><td>
-                        <tr><td colspan="2"><label for="iTitle"><?= $this->getHtml('Title') ?></label>
-                        <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getHtml('Title') ?>" required><td>
-                        <tr><td colspan="2"><label for="iMessage"><?= $this->getHtml('Message') ?></label>
+                            </select>
+                        <tr><td><label for="iDue"><?= $this->getHtml('Due') ?></label>
+                        <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
+                        <tr><td><label for="iTitle"><?= $this->getHtml('Title') ?></label>
+                        <tr><td><input type="text" id="iTitle" name="title" placeholder="&#xf040; <?= $this->getHtml('Title') ?>" required>
+                        <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
                         <tr><td><?= $this->getData('editor')->render('editor-tools'); ?>
                         <tr><td><?= $this->getData('editor')->getData('text')->render('editor-text'); ?>
-                        <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>"><input type="hidden" name="type" value="<?= $this->printHtml(\Modules\Tasks\Models\TaskType::SINGLE); ?>">
+                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>"><input type="hidden" name="type" value="<?= $this->printHtml(\Modules\Tasks\Models\TaskType::SINGLE); ?>">
                     </table>
                 </form>
             </div>