diff --git a/module/task/css/common.ui.css b/module/task/css/common.ui.css
index b3a217e703..b66b89c893 100644
--- a/module/task/css/common.ui.css
+++ b/module/task/css/common.ui.css
@@ -1,5 +1,3 @@
 div.no-background .input-group-addon {background: none;}
 .items-center {align-items: center !important;}
 .flex-center {justify-content: center;}
-.panel-form > .panel-heading.status-heading {justify-content: flex-start; padding-bottom: 0px;}
-.panel-form > .panel-heading.status-heading > .panel-title {font-weight: 400; justify-content:flex-end; width: 5rem;}
diff --git a/module/task/ui/activate.html.php b/module/task/ui/activate.html.php
index 41fadee441..9b5abb257c 100644
--- a/module/task/ui/activate.html.php
+++ b/module/task/ui/activate.html.php
@@ -24,6 +24,7 @@ jsVar('taskMode', $task->mode);
 if($isMultiple) jsVar('assignedToHtml', html::select('assignedTo', $teamMembers, '', "class='form-control' disabled"));
 
 /* zin: Set variables to define control for form. */
+modalHeader();
 $taskModeBox = '';
 if($isMultiple)
 {
@@ -363,4 +364,4 @@ formPanel
 history();
 
 /* ====== Render page ====== */
-modalHeader();
+render();
diff --git a/module/task/ui/assignto.html.php b/module/task/ui/assignto.html.php
index 42d6f7e543..2f653d1ba1 100644
--- a/module/task/ui/assignto.html.php
+++ b/module/task/ui/assignto.html.php
@@ -13,24 +13,14 @@ declare(strict_types=1);
 namespace zin;
 
 /* zin: Define the form in main content */
-formPanel
+modalHeader
 (
     set::title($lang->task->assignAction),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
-    set::actions(array('submit')),
-    set::shadow(false),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($task->name),
-            set::entityID($task->id),
-            set::reverse(true),
-        )
-    ),
+);
+
+formPanel
+(
+    set::submitBtnText($lang->task->assignedTo),
     formGroup
     (
         set::width("1/3"),
@@ -66,8 +56,6 @@ formPanel
     )
 );
 
-h::hr(set::class('mt-6'));
-
 history();
 
 render();
diff --git a/module/task/ui/cancel.html.php b/module/task/ui/cancel.html.php
index f474a00297..c418360693 100644
--- a/module/task/ui/cancel.html.php
+++ b/module/task/ui/cancel.html.php
@@ -12,25 +12,9 @@ declare(strict_types=1);
 
 namespace zin;
 
+modalHeader();
 formPanel
 (
-    set::title($lang->task->cancelAction),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
-    set::shadow(!isAjaxRequest('modal')),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->task->cancel),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($task->name),
-            set::entityID($task->id),
-            set::reverse(true),
-        )
-    ),
     formGroup
     (
         set::label($lang->comment),
@@ -42,8 +26,6 @@ formPanel
     ),
 );
 
-h::hr(set::class('mt-6'));
-
 history();
 
 render();
diff --git a/module/task/ui/close.html.php b/module/task/ui/close.html.php
index 94cf576baf..134b1517e6 100644
--- a/module/task/ui/close.html.php
+++ b/module/task/ui/close.html.php
@@ -12,25 +12,9 @@ declare(strict_types=1);
 
 namespace zin;
 
+modalHeader();
 formPanel
 (
-    set::title($lang->task->closeAction),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
-    set::shadow(!isAjaxRequest('modal')),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->task->close),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($task->name),
-            set::entityID($task->id),
-            set::reverse(true),
-        )
-    ),
     formGroup
     (
         set::label($lang->comment),
@@ -42,8 +26,6 @@ formPanel
     ),
 );
 
-h::hr(set::class('mt-6'));
-
 history();
 
 render();
diff --git a/module/task/ui/finish.html.php b/module/task/ui/finish.html.php
index 9be84257d1..cbeb950e52 100644
--- a/module/task/ui/finish.html.php
+++ b/module/task/ui/finish.html.php
@@ -14,6 +14,7 @@ namespace zin;
 
 if(!$canRecordEffort)
 {
+    modalHeader();
     if($task->assignedTo != $app->user->account && $task->mode == 'linear')
     {
         $deniedNotice = sprintf($lang->task->deniedNotice, $task->assignedToRealName, $lang->task->finish);
@@ -26,7 +27,7 @@ if(!$canRecordEffort)
     div
     (
         set::class('alert with-icon'),
-        icon('exclamation-sign'),
+        icon('exclamation-sign icon-3x'),
         div
         (
             set::class('content'),
@@ -159,8 +160,7 @@ else
             set::control("editor")
         ),
     );
+    history();
 }
 
-history();
-
 render();
diff --git a/module/task/ui/pause.html.php b/module/task/ui/pause.html.php
index 81c054a412..d844dc36b7 100644
--- a/module/task/ui/pause.html.php
+++ b/module/task/ui/pause.html.php
@@ -14,26 +14,10 @@ namespace zin;
 
 /* ====== Define the page structure with zin widgets ====== */
 
+modalHeader();
 formPanel
 (
     set::id('taskPauseForm'),
-    set::title($lang->task->pauseAction),
-    set::headingClass('status-heading'),
-    set::titleClass('form-label .form-grid'),
-    set::shadow(!isAjaxRequest('modal')),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->task->pause),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($task->name),
-            set::entityID($task->id),
-            set::reverse(true),
-        )
-    ),
     formGroup
     (
         set::label($lang->comment),
@@ -45,8 +29,6 @@ formPanel
     ),
 );
 
-h::hr(set::class('mt-6'));
-
 history();
 
 render();
diff --git a/module/task/ui/restart.html.php b/module/task/ui/restart.html.php
index 7ba5f6d5d8..8cc750ed96 100644
--- a/module/task/ui/restart.html.php
+++ b/module/task/ui/restart.html.php
@@ -9,9 +9,9 @@ declare(strict_types=1);
  * @link        https://www.zentao.net
  */
 namespace zin;
-/* ====== Preparing and processing page data ====== */
 
 /* zin: Set variables to define control for form. */
+$assignedToControl = '';
 if($task->mode == 'linear')
 {
     $assignedToControl = inputGroup(
@@ -25,7 +25,7 @@ if($task->mode == 'linear')
         )
     );
 }
-else
+elseif($canRecordEffort)
 {
     $assignedToControl = select(
         set::name('assignedTo'),
@@ -35,7 +35,7 @@ else
 }
 
 /* ====== Define the page structure with zin widgets ====== */
-
+modalHeader();
 if(!$canRecordEffort)
 {
     if($task->assignedTo != $app->user->account && $task->mode == 'linear')
@@ -50,7 +50,7 @@ if(!$canRecordEffort)
     div
     (
         set::class('alert with-icon'),
-        icon('exclamation-sign'),
+        icon('exclamation-sign icon-3x'),
         div
         (
             set::class('content'),
@@ -66,23 +66,6 @@ else
 {
     formPanel
     (
-        set::title($lang->task->restartAction),
-        set::headingClass('status-heading'),
-        set::titleClass('form-label .form-grid'),
-        set::shadow(!isAjaxRequest('modal')),
-        set::actions(array('submit')),
-        set::submitBtnText($lang->task->restart),
-        to::headingActions
-        (
-            entityLabel
-            (
-                setClass('my-3 gap-x-3'),
-                set::level(1),
-                set::text($task->name),
-                set::entityID($task->id),
-                set::reverse(true),
-            )
-        ),
         formGroup
         (
             set::class($task->mode == 'multi' ? 'hidden' : ''),
@@ -142,11 +125,8 @@ else
             )
         ),
     );
+    history();
 }
 
-h::hr(set::class('mt-6'));
-
-history();
-
 /* ====== Render page ====== */
 render();
diff --git a/module/task/ui/start.html.php b/module/task/ui/start.html.php
index 2ddbca1872..5e36bcde66 100644
--- a/module/task/ui/start.html.php
+++ b/module/task/ui/start.html.php
@@ -14,6 +14,7 @@ jsVar('confirmFinish', $lang->task->confirmFinish);
 jsVar('noticeTaskStart', $lang->task->noticeTaskStart);
 
 /* zin: Set variables to define control for form. */
+$assignedToControl = '';
 if($task->mode == 'linear')
 {
     $assignedToControl = inputGroup(
@@ -27,7 +28,7 @@ if($task->mode == 'linear')
         )
     );
 }
-else
+elseif($canRecordEffort)
 {
     $assignedToControl = select(
         set::name('assignedTo'),
@@ -38,6 +39,7 @@ else
 
 /* ====== Define the page structure with zin widgets ====== */
 
+modalHeader();
 if(!$canRecordEffort)
 {
     if($task->assignedTo != $app->user->account && $task->mode == 'linear')
@@ -52,7 +54,7 @@ if(!$canRecordEffort)
     div
     (
         set::class('alert with-icon'),
-        icon('exclamation-sign'),
+        icon('exclamation-sign icon-3x'),
         div
         (
             set::class('content'),
@@ -69,23 +71,6 @@ else
     formPanel
     (
         setID('startForm'),
-        set::title($lang->task->startAction),
-        set::headingClass('status-heading'),
-        set::titleClass('form-label .form-grid'),
-        set::shadow(!isAjaxRequest('modal')),
-        set::actions(array('submit')),
-        set::submitBtnText($lang->task->start),
-        to::headingActions
-        (
-            entityLabel
-            (
-                setClass('my-3 gap-x-3'),
-                set::level(1),
-                set::text($task->name),
-                set::entityID($task->id),
-                set::reverse(true),
-            )
-        ),
         formGroup
         (
             set::class($task->mode == 'multi' ? 'hidden' : ''),
@@ -144,11 +129,9 @@ else
             )
         ),
     );
+    history();
 }
 
-h::hr(set::class('mt-6'));
-
-history();
 
 /* ====== Render page ====== */
 render();
diff --git a/module/task/ui/team.html.php b/module/task/ui/team.html.php
index 7e3e49c81a..c8569b5b95 100644
--- a/module/task/ui/team.html.php
+++ b/module/task/ui/team.html.php
@@ -20,7 +20,7 @@ modalTrigger
         (
             to::headingActions
             (
-                span($lang->task->mode), 
+                span($lang->task->mode),
                 formGroup
                 (
                     set::name('mode'),