diff --git a/module/bug/ui/activate.html.php b/module/bug/ui/activate.html.php
index e6d5cd1bf4..e39771793d 100644
--- a/module/bug/ui/activate.html.php
+++ b/module/bug/ui/activate.html.php
@@ -10,22 +10,11 @@ declare(strict_types=1);
  */
 namespace zin;
 
+include 'common.html.php';
+
 formPanel
 (
-    set::shadow(false),
-    set::title($lang->bug->activate),
-    set::headingClass('status-heading'),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($bug->title),
-            set::entityID($bug->id),
-            set::reverse(true),
-        )
-    ),
+    setCommonProps($bug, $lang->bug->activate) ,
     formGroup
     (
         set::width('1/3'),
@@ -71,13 +60,9 @@ formPanel
         (
             set::name('files[]')
         )
-    ),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->bug->activate)
+    )
 );
 
-h::hr(set::class('mt-6'));
-
 history();
 
 render('modalDialog');
diff --git a/module/bug/ui/assignto.html.php b/module/bug/ui/assignto.html.php
index 476a2b4fe7..bd7b099788 100644
--- a/module/bug/ui/assignto.html.php
+++ b/module/bug/ui/assignto.html.php
@@ -10,28 +10,14 @@ declare(strict_types=1);
  */
 namespace zin;
 
+include 'common.html.php';
+
 jsVar('page', 'assignedto');
 
 /* zin: Define the form in main content. */
 formPanel
 (
-    set::title($lang->bug->assignTo),
-    set::shadow(false),
-    set::headingClass('status-heading'),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->bug->assignTo),
-    set::actionsClass('form-group no-label'),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($bug->title),
-            set::entityID($bug->id),
-            set::reverse(true),
-        )
-    ),
+    setCommonProps($bug, $lang->bug->assignedTo),
     formGroup
     (
         set::width('1/3'),
@@ -56,6 +42,7 @@ formPanel
         set::rows(6),
     ),
 );
+
 history();
 
 render('modalDialog');
diff --git a/module/bug/ui/close.html.php b/module/bug/ui/close.html.php
index ec3e50933e..11f871a6fc 100644
--- a/module/bug/ui/close.html.php
+++ b/module/bug/ui/close.html.php
@@ -10,19 +10,22 @@ declare(strict_types=1);
  */
 namespace zin;
 
-set::title($bug->title);
-form
+include 'common.html.php';
+
+formPanel
 (
-    set::actions(array('submit')),
-    set::submitBtnText($lang->bug->close),
-    set::class('pb-6 border-b'),
+    setCommonProps($bug, $lang->bug->close),
     formGroup
     (
         set::label($lang->comment),
         set::name('comment'),
         set::control('editor')
-    )
+    ),
+    set::actions(array('submit')),
+    set::submitBtnText($lang->bug->close),
+    set::class('border-b'),
 );
+
 history();
 
 render('modalDialog');
diff --git a/module/bug/ui/confirm.html.php b/module/bug/ui/confirm.html.php
index da01747580..7fee72c4c7 100644
--- a/module/bug/ui/confirm.html.php
+++ b/module/bug/ui/confirm.html.php
@@ -10,11 +10,13 @@ declare(strict_types=1);
  */
 namespace zin;
 
+include 'common.html.php';
+
 jsVar('page', 'confirm');
 
 formPanel
 (
-    set::title($bug->title),
+    setCommonProps($bug, $lang->bug->confirm),
     formGroup
     (
         set::width('1/3'),
@@ -68,8 +70,9 @@ formPanel
             set::name('comment'),
             set::value(),
         )
-    ),
+    )
 );
+
 history();
 
 render('modalDialog');
diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index b39fc2878d..3401baefea 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -10,6 +10,8 @@ declare(strict_types=1);
  */
 namespace zin;
 
+include 'common.html.php';
+
 jsVar('bugID',     $bug->id);
 jsVar('productID', $bug->product);
 jsVar('page',      'resolve');
@@ -35,23 +37,7 @@ if(common::hasPriv('build', 'create'))
 /* zin: Define the form in main content. */
 formPanel
 (
-    set::title($lang->bug->resolve),
-    set::shadow(false),
-    set::headingClass('status-heading'),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->bug->resolve),
-    set::actionsClass('form-group no-label'),
-    to::headingActions
-    (
-        entityLabel
-        (
-            setClass('my-3 gap-x-3'),
-            set::level(1),
-            set::text($bug->title),
-            set::entityID($bug->id),
-            set::reverse(true),
-        )
-    ),
+    setCommonProps($bug, $lang->bug->resolve),
     formGroup
     (
         set::width('1/3'),
@@ -162,6 +148,7 @@ formPanel
         set::rows(6),
     ),
 );
+
 history();
 
 render('modalDialog');