diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 28db5c288..fc7103ef7 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -160,23 +160,25 @@ class Task extends Base
         }
 
         $task['score'] = $task['score'] ?: '';
+        $ajax = $this->request->isAjax();
 
         $params = array(
-                'values' => $task,
-                'errors' => array(),
-                'task' => $task,
-                'users_list' => $this->projectPermission->getUsersList($task['project_id']),
-                'colors_list' => $this->color->getList(),
-                'categories_list' => $this->category->getList($task['project_id']),
-                'ajax' => $this->request->isAjax(),
-                'menu' => 'tasks',
-                'title' => t('Edit a task')
-            );
-        if ($this->request->isAjax()) {
+            'values' => $task,
+            'errors' => array(),
+            'task' => $task,
+            'users_list' => $this->projectPermission->getUsersList($task['project_id']),
+            'colors_list' => $this->color->getList(),
+            'categories_list' => $this->category->getList($task['project_id']),
+            'ajax' => $ajax,
+            'menu' => 'tasks',
+            'title' => t('Edit a task')
+        );
+
+        if ($ajax) {
             $this->response->html($this->template->load('task_edit', $params));
         }
         else {
-            $this->response->html($this->template->layout('task_edit', $params));
+            $this->response->html($this->taskLayout('task_edit', $params));
         }
     }
 
@@ -209,7 +211,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->template->layout('task_edit', array(
+        $this->response->html($this->taskLayout('task_edit', array(
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
@@ -218,7 +220,8 @@ class Task extends Base
             'colors_list' => $this->color->getList(),
             'categories_list' => $this->category->getList($values['project_id']),
             'menu' => 'tasks',
-            'title' => t('Edit a task')
+            'title' => t('Edit a task'),
+            'ajax' => $this->request->isAjax(),
         )));
     }
 
diff --git a/app/Core/Listener.php b/app/Core/Listener.php
index 0df641ba6..9c96cd572 100644
--- a/app/Core/Listener.php
+++ b/app/Core/Listener.php
@@ -8,8 +8,8 @@ namespace Core;
  * @package core
  * @author  Frederic Guillot
  */
-interface Listener {
-
+interface Listener
+{
     /**
      * Execute the listener
      *
diff --git a/app/Model/TaskValidator.php b/app/Model/TaskValidator.php
index 461c03d40..1c7b0b14e 100644
--- a/app/Model/TaskValidator.php
+++ b/app/Model/TaskValidator.php
@@ -79,13 +79,35 @@ class TaskValidator extends Base
     }
 
     /**
-     * Validate task modification
+     * Validate task modification (form)
      *
      * @access public
      * @param  array   $values           Form values
      * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
      */
     public function validateModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+            new Validators\Required('title', t('The title is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate task modification (Api)
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateApiModification(array $values)
     {
         $rules = array(
             new Validators\Required('id', t('The id is required')),
diff --git a/app/Templates/task_edit.php b/app/Templates/task_edit.php
index 83a4ca17d..4038717ec 100644
--- a/app/Templates/task_edit.php
+++ b/app/Templates/task_edit.php
@@ -1,58 +1,51 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Edit a task') ?></h2>
-        <?php if (! $ajax): ?>
-        <ul>
-            <li><a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('Back to the board') ?></a></li>
-        </ul>
+<div class="page-header">
+    <h2><?= t('Edit a task') ?></h2>
+</div>
+<section id="task-section">
+<form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
+
+    <?= Helper\form_csrf() ?>
+
+    <div class="form-column">
+
+        <?= Helper\form_label(t('Title'), 'title') ?>
+        <?= Helper\form_text('title', $values, $errors, array('required')) ?><br/>
+
+        <?= Helper\form_label(t('Description'), 'description') ?>
+        <?= Helper\form_textarea('description', $values, $errors) ?><br/>
+        <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
+
+    </div>
+
+    <div class="form-column">
+        <?= Helper\form_hidden('id', $values) ?>
+        <?= Helper\form_hidden('project_id', $values) ?>
+
+        <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
+        <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
+
+        <?= Helper\form_label(t('Category'), 'category_id') ?>
+        <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
+
+        <?= Helper\form_label(t('Color'), 'color_id') ?>
+        <?= Helper\form_select('color_id', $colors_list, $values, $errors) ?><br/>
+
+        <?= Helper\form_label(t('Complexity'), 'score') ?>
+        <?= Helper\form_number('score', $values, $errors) ?><br/>
+
+        <?= Helper\form_label(t('Due Date'), 'date_due') ?>
+        <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
+        <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
+    </div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+        <?= t('or') ?>
+        <?php if ($ajax): ?>
+            <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
+        <?php else: ?>
+            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
         <?php endif ?>
     </div>
-    <section id="task-section">
-    <form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
-
-        <?= Helper\form_csrf() ?>
-
-        <div class="form-column">
-
-            <?= Helper\form_label(t('Title'), 'title') ?>
-            <?= Helper\form_text('title', $values, $errors, array('required')) ?><br/>
-
-            <?= Helper\form_label(t('Description'), 'description') ?>
-            <?= Helper\form_textarea('description', $values, $errors) ?><br/>
-            <div class="form-help"><a href="http://kanboard.net/documentation/syntax-guide" target="_blank" rel="noreferrer"><?= t('Write your text in Markdown') ?></a></div>
-
-        </div>
-
-        <div class="form-column">
-            <?= Helper\form_hidden('id', $values) ?>
-            <?= Helper\form_hidden('project_id', $values) ?>
-
-            <?= Helper\form_label(t('Assignee'), 'owner_id') ?>
-            <?= Helper\form_select('owner_id', $users_list, $values, $errors) ?><br/>
-
-            <?= Helper\form_label(t('Category'), 'category_id') ?>
-            <?= Helper\form_select('category_id', $categories_list, $values, $errors) ?><br/>
-
-            <?= Helper\form_label(t('Color'), 'color_id') ?>
-            <?= Helper\form_select('color_id', $colors_list, $values, $errors) ?><br/>
-
-            <?= Helper\form_label(t('Complexity'), 'score') ?>
-            <?= Helper\form_number('score', $values, $errors) ?><br/>
-
-            <?= Helper\form_label(t('Due Date'), 'date_due') ?>
-            <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
-            <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
-        </div>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-            <?= t('or') ?>
-            <?php if ($ajax): ?>
-                <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
-            <?php else: ?>
-                <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-            <?php endif ?>
-        </div>
-    </form>
-    </section>
+</form>
 </section>
diff --git a/assets/css/app.css b/assets/css/app.css
index 3f6e131f5..ff8591151 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -222,6 +222,10 @@ textarea.form-error {
     list-style-type: none;
 }
 
+ul.form-errors li {
+    margin-left: 0;
+}
+
 .form-help {
     font-size: 0.8em;
     color: brown;
diff --git a/jsonrpc.php b/jsonrpc.php
index 2fbfb5a6c..2dbab4614 100644
--- a/jsonrpc.php
+++ b/jsonrpc.php
@@ -211,7 +211,7 @@ $server->register('updateTask', function($id, $title = null, $project_id = null,
         }
     }
 
-    list($valid) = $taskValidator->validateModification($values);
+    list($valid) = $taskValidator->validateApiModification($values);
     return $valid && $task->update($values);
 });