diff --git a/lib/zin/wg/tabledata/v1.php b/lib/zin/wg/tabledata/v1.php
index 64348bd4da..122f97c300 100644
--- a/lib/zin/wg/tabledata/v1.php
+++ b/lib/zin/wg/tabledata/v1.php
@@ -31,7 +31,7 @@ class tableData extends wg
             ),
             h::td
             (
-                setClass('py-1.5 pl-2', $item->prop('tdClass')),
+                setClass('py-1.5 pl-2 w-full', $item->prop('tdClass')),
                 $item->children()
             )
         );
diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php
index 4afa1b3555..1e2b0cb57f 100644
--- a/module/task/ui/edit.html.php
+++ b/module/task/ui/edit.html.php
@@ -161,6 +161,7 @@ detailBody
                     ))),
                     checkList
                     (
+                        setClass('shrink-0 ml-3'),
                         set::name('showAllModule'),
                         set::items(array('1' => $lang->all)),
                         set::value($showAllModule ? '1' : ''),
@@ -263,23 +264,30 @@ detailBody
                 set::name($lang->task->mailto),
                 inputGroup
                 (
-                    control(set(array
+                    div
                     (
-                        'name' => 'mailto[]',
-                        'id' => 'mailto',
-                        'value' => $task->mailto,
-                        'type' => 'picker',
-                        'items' => $mailtoOptions,
-                        'multiple' => true
-                    ))),
-                    control
+                        setStyle('width', '70%'),
+                        control(set(array
+                        (
+                            'name' => 'mailto[]',
+                            'id' => 'mailto',
+                            'value' => $task->mailto,
+                            'type' => 'picker',
+                            'items' => $mailtoOptions,
+                            'multiple' => true
+                        ))),
+                    ),
+                    div
                     (
                         setStyle('width', '30%'),
-                        set::name('contactListMenu'),
-                        set::type('picker'),
-                        set::items($contactListMenuOptions),
-                        on::change('setMailto')
-                    ),
+                        control
+                        (
+                            set::name('contactListMenu'),
+                            set::type('picker'),
+                            set::items($contactListMenuOptions),
+                            on::change('setMailto')
+                        ),
+                    )
                 )
             ),
         ),