diff --git a/ui-lib.pl b/ui-lib.pl
index 7ac4fde17..532dbedc3 100755
--- a/ui-lib.pl
+++ b/ui-lib.pl
@@ -1442,7 +1442,7 @@ generated by ui_buttons_row. Some example code :
 sub ui_buttons_start
 {
 return &theme_ui_buttons_start(@_) if (defined(&theme_ui_buttons_start));
-return "<table width='100%' class='ui_buttons_table'>\n";
+return "<table width='100%' class='ui_buttons_table'>\n<tr><td>";
 }
 
 =head2 ui_buttons_end
@@ -1453,7 +1453,7 @@ Returns HTML for the end of a block started by ui_buttons_start.
 sub ui_buttons_end
 {
 return &theme_ui_buttons_end(@_) if (defined(&theme_ui_buttons_end));
-return "</table>\n";
+return "</td></tr></table>\n";
 }
 
 =head2 ui_buttons_row(script, button-label, description, [hiddens], [after-submit], [before-submit]) 
@@ -1483,12 +1483,13 @@ if (ref($hiddens)) {
 	}
 return "<form action='$script' class='ui_buttons_form' method='post'>\n".
        $hiddens.
+       "<table>".
        "<tr class='ui_buttons_row'> ".
        "<td nowrap width='20%' valign='top' class='ui_buttons_label'>".
        ($before ? $before." " : "").
        &ui_submit($label).($after ? " ".$after : "")."</td>\n".
        "<td width='80%' valign='top' class='ui_buttons_value'>".
-       $desc."</td></tr>\n".
+       $desc."</td></tr></table>\n".
        "</form>\n";
 }
 
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 8dbf649a0..9648af860 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -7258,8 +7258,8 @@ sub help_search_link
 if (&foreign_available("man") && !$tconfig{'nosearch'}) {
 	my $for = &urlize(shift(@_));
 	return "<a href='$gconfig{'webprefix'}/man/search.cgi?".
-	       join("&", map { "section=$_" } @_)."&".
-	       "for=$for&exact=1&check=".&get_module_name()."'>".
+	       join("&amp;", map { "section=$_" } @_)."&amp;".
+	       "for=$for&amp;exact=1&amp;check=".&get_module_name()."'>".
 	       $text{'helpsearch'}."</a>\n";
 	}
 else {