diff --git a/module/execution/ui/create.html.php b/module/execution/ui/create.html.php
index 3779ee6bd7..b893ba6b90 100644
--- a/module/execution/ui/create.html.php
+++ b/module/execution/ui/create.html.php
@@ -392,15 +392,7 @@ formPanel
         set::required(true),
     ) : null,
     $productsBox,
-    formRow
-    (
-        setClass('border-b border-b-1'),
-        div
-        (
-            setClass('bg-lighter font-black px-3 py-1'),
-            $lang->execution->teamSetting
-        ),
-    ),
+    formRowGroup(set::title($lang->execution->teamSetting)),
     formGroup
     (
         set::width('1/2'),
diff --git a/module/execution/ui/edit.html.php b/module/execution/ui/edit.html.php
index cf810a6e32..316975bef4 100644
--- a/module/execution/ui/edit.html.php
+++ b/module/execution/ui/edit.html.php
@@ -501,15 +501,7 @@ formPanel
         set::value($execution->status),
     ),
     $productsBox,
-    formRow
-    (
-        setClass('border-b border-b-1'),
-        div
-        (
-            setClass('bg-lighter font-black px-3 py-1'),
-            $lang->execution->teamSetting
-        ),
-    ),
+    formRowGroup(set::title($lang->execution->teamSetting)),
     formGroup
     (
         set::width('1/2'),
diff --git a/module/user/ui/edit.html.php b/module/user/ui/edit.html.php
index 9236e36eee..12f6e30359 100644
--- a/module/user/ui/edit.html.php
+++ b/module/user/ui/edit.html.php
@@ -163,15 +163,7 @@ formPanel
             ),
         ),
     ),
-    formRow
-    (
-        setClass('border-b border-b-1'),
-        div
-        (
-            setClass('bg-lighter font-black px-3 py-1'),
-            $lang->user->accountInfo
-        ),
-    ),
+    formRowGroup(set::title($lang->user->accountInfo)),
     formRow
     (
         formGroup
@@ -244,15 +236,7 @@ formPanel
             ),
         )
     ),
-    formRow
-    (
-        setClass('border-b border-b-1'),
-        div
-        (
-            setClass('bg-lighter font-black px-3 py-1'),
-            $lang->user->contactInfo
-        ),
-    ),
+    formRowGroup(set::title($lang->user->contactInfo)),
     $contacts,
     formRow
     (
@@ -271,15 +255,7 @@ formPanel
             set::value($user->zipcode),
         )
     ),
-    formRow
-    (
-        setClass('border-b border-b-1'),
-        div
-        (
-            setClass('bg-lighter font-black px-3 py-1'),
-            $lang->user->verify
-        ),
-    ),
+    formRowGroup(set::title($lang->user->verify)),
     formRow
     (
         formGroup