diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index da92539..ccda6e7 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -73,7 +73,7 @@ return [
             ],
         ],
     ],
-    '^/checklist/template/task(\?.*$|$)' => [
+    '^/checklist/template/task/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Checklist\Controller\BackendController:viewChecklistTemplateTaskView',
             'verb'       => RouteVerb::GET,
@@ -84,4 +84,15 @@ return [
             ],
         ],
     ],
+    '^/checklist/template/task/create(\?.*$|$)' => [
+        [
+            'dest'       => '\Modules\Checklist\Controller\BackendController:viewChecklistTemplateTaskCreate',
+            'verb'       => RouteVerb::GET,
+            'permission' => [
+                'module' => BackendController::NAME,
+                'type'   => PermissionType::CREATE,
+                'state'  => PermissionCategory::TEMPLATE,
+            ],
+        ],
+    ],
 ];
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index c008e9c..a5091bf 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -53,7 +53,7 @@ final class BackendController extends Controller
 
         $view->data['checklists'] = ChecklistMapper::getAll()
             ->sort('id', OrderType::DESC)
-            ->execute();
+            ->executeGetArray();
 
         return $view;
     }
@@ -110,7 +110,7 @@ final class BackendController extends Controller
 
         $view->data['templates'] = ChecklistTemplateMapper::getAll()
             ->sort('id', OrderType::DESC)
-            ->execute();
+            ->executeGetArray();
 
         return $view;
     }
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 8c3cb76..672c529 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -26,7 +26,7 @@ return ['Checklist' => [
     'Templates'     => 'Vorlagen',
     'TimeInMinutes' => 'Zeit in Minuten.',
     'Title'         => 'Titel',
-    'Template'         => 'Template',
+    'Template'      => 'Template',
     'Start'         => 'Start',
-    'End'         => 'Ende',
+    'End'           => 'Ende',
 ]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 301df4e..9038326 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -26,7 +26,7 @@ return ['Checklist' => [
     'Templates'     => 'Templates',
     'TimeInMinutes' => 'Time in minutes',
     'Title'         => 'Title',
-    'Template'         => 'Template',
+    'Template'      => 'Template',
     'Start'         => 'Start',
-    'End'         => 'End',
+    'End'           => 'End',
 ]];
diff --git a/Theme/Backend/checklist-template-list.tpl.php b/Theme/Backend/checklist-template-list.tpl.php
index 990ad31..9613aa8 100755
--- a/Theme/Backend/checklist-template-list.tpl.php
+++ b/Theme/Backend/checklist-template-list.tpl.php
@@ -12,8 +12,6 @@
  */
 declare(strict_types=1);
 
-use phpOMS\Uri\UriFactory;
-
 /**
  * @var \phpOMS\Views\View $this
  */
diff --git a/Theme/Backend/checklist-template.tpl.php b/Theme/Backend/checklist-template.tpl.php
index c71947b..b27ecc3 100644
--- a/Theme/Backend/checklist-template.tpl.php
+++ b/Theme/Backend/checklist-template.tpl.php
@@ -92,7 +92,7 @@ echo $this->data['nav']->render(); ?>
             <div class="portlet-head">
                 <?= $this->getHtml('Tasks'); ?>
                 <span class="end-xs">
-                    <a class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/base}/checklist/template/task?{?}&csrf={$CSRF}'); ?>"><?= $this->getHtml('Add', '0', '0'); ?></a>
+                    <a class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/base}/checklist/template/task/create?{?}&csrf={$CSRF}'); ?>"><?= $this->getHtml('Add', '0', '0'); ?></a>
                 </span>
             </div>
             <div class="slider">
@@ -105,7 +105,7 @@ echo $this->data['nav']->render(); ?>
                 <tbody>
                 <?php $c = 0;
                 foreach ($this->data['template']->tasks as $key => $task) : ++$c;
-                    $url = \phpOMS\Uri\UriFactory::build('{/base}/checklist/template/task?{?}&id=' . $task->id);
+                    $url = \phpOMS\Uri\UriFactory::build('{/base}/checklist/template/task/view?{?}&id=' . $task->id);
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td><?php if ($task->priority === TaskPriority::NONE) : ?>