diff --git a/help/index.cgi b/help/index.cgi
index b3a8f9062..65ee7ab66 100755
--- a/help/index.cgi
+++ b/help/index.cgi
@@ -11,18 +11,15 @@ foreach $m (&list_modules()) {
 
 print &ui_form_start("search.cgi", "post");
 print &ui_table_start($text{'index_header'}, undef, 2);
-print &ui_table_row($text{'index_terms'}, &ui_textbox("terms", undef, 50), undef, [ "valign=middle","valign=middle" ]);
+print &ui_table_row($text{'index_terms'},
+	&ui_textbox("terms", undef, 50));
 print &ui_table_row($text{'index_mods'}, 
         &ui_radio("all", 1,
-        [ [ 1, $text{'index_all'} ],
-        [ 0, $text{'index_sel'} ] ]), undef, [ "valign=middle","valign=middle" ]);
-print &ui_table_row(" ",
-        &ui_select("mods", undef, \@list_modules, 5, 1), undef, [ "valign=top" ]);
-print &ui_table_row(" ",
-        &ui_submit($text{'index_search'})." ".&ui_reset($text{'index_reset'}));
+		[ [ 1, $text{'index_all'} ],
+		[ 0, $text{'index_sel'} ] ])."<br>\n".
+        &ui_select("mods", undef, \@list_modules, 5, 1));
 print ui_table_end();
-
-print &ui_form_end();
+print &ui_form_end([ [ undef, $text{'index_search'} ] ]);
 
 &ui_print_footer("/", $text{'index'});
 
diff --git a/help/search.cgi b/help/search.cgi
index ede72d3e3..1f4538d52 100755
--- a/help/search.cgi
+++ b/help/search.cgi
@@ -48,18 +48,17 @@ foreach $m (@mods) {
 # Display the results
 if (@match) {
 	print "<b>",&text('search_results', "<tt>$terms</tt>"),"</b><p>\n";
-	print "<table border width=100%>\n";
-	print "<tr $tb> <td><b>$text{'search_page'}</b></td> ",
-	      "<td><b>$text{'search_mod'}</b></td> ",
-	      "<td><b>$text{'search_line'}</b></td> </tr>\n";
+	print &ui_columns_start([ $text{'search_page'},
+				  $text{'search_mod'},
+				  $text{'search_line'} ]);
 	foreach $m (@match) {
-		print "<tr $cb>\n";
-		print "<td>",&hlink($m->[3], $m->[2], $m->[0]),"</td>\n";
-		print "<td>$m->[1]</td>\n";
-		print "<td>$m->[4]</td>\n";
-		print "</tr>\n";
+		print &ui_columns_row([
+			&hlink($m->[3], $m->[2], $m->[0]),
+			$m->[1],
+			$m->[4],
+			]);
 		}
-	print "</table><p>\n";
+	print &ui_columns_end();
 	}
 else {
 	print "<p><b>$text{'search_none'}</b> <p>\n";