diff --git a/sendmail/lang/en b/sendmail/lang/en
index 2c927e1fa..243c0203e 100644
--- a/sendmail/lang/en
+++ b/sendmail/lang/en
@@ -159,7 +159,7 @@ adelete_ecannot=You are not allowed to delete the alias $1
 cws_title=Local Domains
 cws_ecannot=You are not allowed to edit local domains
 cws_domains=Domains handled by this server
-cws_desc1=Apart from mail to $1, sendmail will only accept for local delivery mail for domains and hostnames listed in the text box to the left. If you want your mail server to handle multiple email domains, they must all be listed on this form.
+cws_desc1=Apart from mail to $1, sendmail will only accept for local delivery mail for domains and hostnames listed in the text box below. If you want your mail server to handle multiple email domains, they must all be listed on this form.
 cws_desc2=Note that merely including a domain in the list is not usually enough. You must also make sure that a DNS record for the domain exists, and points to your system.
 cws_err=Failed to save local domains
 cws_ehost='$1' is not a valid host or domain name
diff --git a/sendmail/list_cws.cgi b/sendmail/list_cws.cgi
index 7e93b3a47..cb41e318e 100755
--- a/sendmail/list_cws.cgi
+++ b/sendmail/list_cws.cgi
@@ -9,18 +9,16 @@ $access{'cws'} || &error($text{'cws_ecannot'});
 $conf = &get_sendmailcf();
 @dlist = &get_file_or_config($conf, "w");
 
-print "<form method=post action=save_cws.cgi enctype=multipart/form-data>\n";
-print "<table cellpadding=5 width=100%><tr><td valign=top nowrap>\n";
-print "<b>$text{'cws_domains'}</b><br>\n";
-print "<textarea name=dlist rows=15 cols=65>",
-	join("\n", @dlist),"</textarea><br>\n";
-print "<input type=submit value=\"$text{'save'}\">\n";
-
-print "</td><td valign=top>\n";
+# Explanation
 print &text('cws_desc1', "<tt>".&get_system_hostname()."</tt>"),"<p>\n";
-print $text{'cws_desc2'},"\n";
-print "</td></tr></table>\n";
-print "</form>\n";
+print $text{'cws_desc2'},"<p>\n";
+
+# Local domains field
+print &ui_form_start("save_cws.cgi", "form-data");
+print &ui_table_start(undef, undef, 2);
+print &ui_table_row(undef, ui_textarea("dlist", join("\n", @dlist), 15, 80), 2);
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 
diff --git a/sendmail/list_masq.cgi b/sendmail/list_masq.cgi
index d51a35d9d..4b24b461e 100755
--- a/sendmail/list_masq.cgi
+++ b/sendmail/list_masq.cgi
@@ -18,24 +18,28 @@ foreach $d (&find_type("D", $conf)) {
 # Get non-masqueraded domains
 @nlist = &get_file_or_config($conf, "N");
 
-print "<form method=post action=save_masq.cgi enctype=multipart/form-data>\n";
-print "<b>$text{'masq_domain'}</b>\n";
-print "<input name=masq size=30 value=\"$masq\"><br>\n";
-
-print "<table cellpadding=5 width=100%><tr><td valign=top nowrap>\n";
-print "<b>$text{'masq_domains'}</b><br>\n";
-print "<textarea name=mlist rows=8 cols=65>",
-	join("\n", @mlist),"</textarea><br>\n";
-print "<b>$text{'masq_ndomains'}</b><br>\n";
-print "<textarea name=nlist rows=7 cols=65>",
-	join("\n", @nlist),"</textarea><br>\n";
-print "<input type=submit value=\"$text{'save'}\">\n";
-
-print "</td><td valign=top>\n";
+# Introduction text
 print &text('masq_desc1', 'list_generics.cgi'),"<p>\n";
-print $text{'masq_desc2'},"\n";
-print "</td></tr></table>\n";
-print "</form>\n";
+print $text{'masq_desc2'},"<p>\n";
+
+
+print &ui_form_start("save_masq.cgi", "form-data");
+print &ui_table_start(undef, undef, 2);
+
+# Masquerade as domain
+print &ui_table_row($text{'masq_domain'},
+	&ui_textbox("masq", $masq, 60));
+
+# Domains to masquerade
+print &ui_table_row($text{'masq_domains'},
+	&ui_textarea("mlist", join("\n", @mlist), 8, 60));
+
+# Domains to not masquerade
+print &ui_table_row($text{'masq_ndomains'},
+	&ui_textarea("nlist", join("\n", @nlist), 8, 60));
+
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});