diff --git a/module/task/control.php b/module/task/control.php
index 9bc427687a..ccc48468d9 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -623,6 +623,8 @@ class task extends control
 
         if(!empty($_POST))
         {
+            $oldTask = $this->task->getByID($taskID);
+
             /* Init task data. */
             $task = form::data($this->config->task->form->pause)->get();
             $task->id = $taskID;
@@ -642,7 +644,7 @@ class task extends control
 
             /* Get response after the suspended task. */
             $from     = zget($output, 'from');
-            $response = $this->taskZen->responseAfterChangeStatus($task, $from);
+            $response = $this->taskZen->responseAfterChangeStatus($oldTask, $from);
             return $this->send($response);
         }
 
@@ -840,8 +842,7 @@ class task extends control
 
             $this->executeHooks($taskID);
 
-            $task = $this->task->getById($taskID);
-            if(isonlybody()) return $this->taskZen->responseModal($task, $from, $regionID);
+            if(isonlybody()) return $this->taskZen->responseModal($oldTask, $from, $regionID);
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $this->createLink('task', 'view', "taskID=$taskID")));
         }
 
diff --git a/module/task/ui/activate.html.php b/module/task/ui/activate.html.php
index fb7e846a73..6caf9fa282 100644
--- a/module/task/ui/activate.html.php
+++ b/module/task/ui/activate.html.php
@@ -93,6 +93,8 @@ formPanel
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
     set::shadow(!isonlybody()),
+    set::actions(array('submit')),
+    set::submitBtnText($lang->task->activate),
     to::headingActions
     (
         entityLabel
diff --git a/module/task/ui/assignto.html.php b/module/task/ui/assignto.html.php
index 1c41110812..1ca3d48e68 100644
--- a/module/task/ui/assignto.html.php
+++ b/module/task/ui/assignto.html.php
@@ -18,7 +18,8 @@ formPanel
     set::title($lang->task->assignAction),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::actions(array('submit')),
+    set::shadow(false),
     to::headingActions
     (
         entityLabel
@@ -30,7 +31,6 @@ formPanel
             set::reverse(true),
         )
     ),
-    set::shadow(!isonlybody()),
     formGroup
     (
         set::width("1/3"),
@@ -70,4 +70,4 @@ h::hr(set::class('mt-6'));
 
 history();
 
-render(isonlybody() ? 'modalDialog' : 'page');
+render('modalDialog');
diff --git a/module/task/ui/cancel.html.php b/module/task/ui/cancel.html.php
index a7633d45ae..e64263fdda 100644
--- a/module/task/ui/cancel.html.php
+++ b/module/task/ui/cancel.html.php
@@ -18,6 +18,8 @@ formPanel
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
     set::shadow(!isonlybody()),
+    set::actions(array('submit')),
+    set::submitBtnText($lang->task->cancel),
     to::headingActions
     (
         entityLabel
diff --git a/module/task/ui/close.html.php b/module/task/ui/close.html.php
index 45b8f9bf33..316799219a 100644
--- a/module/task/ui/close.html.php
+++ b/module/task/ui/close.html.php
@@ -18,6 +18,8 @@ formPanel
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
     set::shadow(!isonlybody()),
+    set::actions(array('submit')),
+    set::submitBtnText($lang->task->close),
     to::headingActions
     (
         entityLabel
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index 0d1a462ecc..bae11f9709 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -325,7 +325,7 @@ formPanel
         (
             input
             (
-                set::type('date'),
+                set::control('date'),
                 set::name('estStarted'),
                 set::value($task->estStarted),
                 set::placeholder($lang->task->estStarted),
@@ -333,7 +333,7 @@ formPanel
             $lang->task->to,
             input
             (
-                set::type('date'),
+                set::control('date'),
                 set::name('deadline'),
                 set::value($task->deadline),
                 set::placeholder($lang->task->deadline),
diff --git a/module/task/ui/finish.html.php b/module/task/ui/finish.html.php
index 1ff28b2c44..f66b81b31b 100644
--- a/module/task/ui/finish.html.php
+++ b/module/task/ui/finish.html.php
@@ -81,6 +81,8 @@ else
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
         set::shadow(!isonlybody()),
+        set::actions(array('submit')),
+        set::submitBtnText($lang->task->finish),
         to::heading
         (
             entityLabel
diff --git a/module/task/ui/pause.html.php b/module/task/ui/pause.html.php
index bb83a297af..73e8850c88 100644
--- a/module/task/ui/pause.html.php
+++ b/module/task/ui/pause.html.php
@@ -21,6 +21,8 @@ formPanel
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
     set::shadow(!isonlybody()),
+    set::actions(array('submit')),
+    set::submitBtnText($lang->task->pause),
     to::headingActions
     (
         entityLabel
diff --git a/module/task/ui/restart.html.php b/module/task/ui/restart.html.php
index af45c1eca5..41a5903143 100644
--- a/module/task/ui/restart.html.php
+++ b/module/task/ui/restart.html.php
@@ -70,6 +70,8 @@ else
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
         set::shadow(!isonlybody()),
+        set::actions(array('submit')),
+        set::submitBtnText($lang->task->restart),
         to::headingActions
         (
             entityLabel
diff --git a/module/task/ui/start.html.php b/module/task/ui/start.html.php
index 9f764736ca..293e71fa1d 100644
--- a/module/task/ui/start.html.php
+++ b/module/task/ui/start.html.php
@@ -72,6 +72,8 @@ else
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
         set::shadow(!isonlybody()),
+        set::actions(array('submit')),
+        set::submitBtnText($lang->task->start),
         to::headingActions
         (
             entityLabel