diff --git a/module/bug/ui/activate.html.php b/module/bug/ui/activate.html.php
index 6003faa382..ab27c72e59 100644
--- a/module/bug/ui/activate.html.php
+++ b/module/bug/ui/activate.html.php
@@ -10,11 +10,10 @@ declare(strict_types=1);
  */
 namespace zin;
 
-include 'common.html.php';
+include $app->getModuleRoot() . 'common/ui/header.modal.html.php';
 
-formPanel
+form
 (
-    setCommonProps($bug) ,
     formGroup
     (
         set::width('1/3'),
diff --git a/module/bug/ui/assignto.html.php b/module/bug/ui/assignto.html.php
index 2e2d60b416..1f3c94867b 100644
--- a/module/bug/ui/assignto.html.php
+++ b/module/bug/ui/assignto.html.php
@@ -10,14 +10,14 @@ declare(strict_types=1);
  */
 namespace zin;
 
-include 'common.html.php';
+include $app->getModuleRoot() . 'common/ui/header.modal.html.php';
 
 jsVar('page', 'assignedto');
 
 /* zin: Define the form in main content. */
-formPanel
+form
 (
-    setCommonProps($bug, $lang->bug->assignTo),
+    set::submitBtnText($lang->bug->assignTo),
     formGroup
     (
         set::width('1/3'),
diff --git a/module/bug/ui/close.html.php b/module/bug/ui/close.html.php
index 24e8ff0d3b..6c420ceec5 100644
--- a/module/bug/ui/close.html.php
+++ b/module/bug/ui/close.html.php
@@ -10,20 +10,16 @@ declare(strict_types=1);
  */
 namespace zin;
 
-include 'common.html.php';
+include $app->getModuleRoot() . 'common/ui/header.modal.html.php';
 
-formPanel
+form
 (
-    setCommonProps($bug),
     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();
diff --git a/module/bug/ui/confirm.html.php b/module/bug/ui/confirm.html.php
index 635ec09515..cfb5c303a9 100644
--- a/module/bug/ui/confirm.html.php
+++ b/module/bug/ui/confirm.html.php
@@ -10,13 +10,12 @@ declare(strict_types=1);
  */
 namespace zin;
 
-include 'common.html.php';
+include $app->getModuleRoot() . 'common/ui/header.modal.html.php';
 
 jsVar('page', 'confirm');
 
-formPanel
+form
 (
-    setCommonProps($bug),
     formGroup
     (
         set::width('1/3'),
diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php
index 92430f2d24..2ed375b9c3 100644
--- a/module/bug/ui/resolve.html.php
+++ b/module/bug/ui/resolve.html.php
@@ -10,7 +10,7 @@ declare(strict_types=1);
  */
 namespace zin;
 
-include 'common.html.php';
+include $app->getModuleRoot() . 'common/ui/header.modal.html.php';
 
 jsVar('bugID',     $bug->id);
 jsVar('productID', $bug->product);
@@ -35,9 +35,8 @@ if(common::hasPriv('build', 'create'))
 }
 
 /* zin: Define the form in main content. */
-formPanel
+form
 (
-    setCommonProps($bug),
     formGroup
     (
         set::width('1/3'),