diff --git a/cluster-useradmin/edit_group.cgi b/cluster-useradmin/edit_group.cgi
index 4a0778728..ac822d305 100755
--- a/cluster-useradmin/edit_group.cgi
+++ b/cluster-useradmin/edit_group.cgi
@@ -111,10 +111,10 @@ if (@icons < @hosts) {
 	      "value=\"$text{'uedit_sync'}\"></td>\n";
 	}
 
-print "</form><form action=\"delete_group.cgi\">\n";
+print "</tr></table></form><p><form action=\"delete_group.cgi\">\n";
 print "<input type=hidden name=group value=\"$ginfo{'group'}\">\n";
-print "<td align=right><input type=submit value=\"$text{'delete'}\"></td> </tr>\n";
-print "</form></table><p>\n";
+print "<input type=submit value=\"$text{'delete'}\">\n";
+print "</form><p>\n";
 
 print &ui_hr();
 print &ui_subheading($text{'uedit_hosts'});
diff --git a/cluster-useradmin/edit_user.cgi b/cluster-useradmin/edit_user.cgi
index b08573e37..3234e07e3 100755
--- a/cluster-useradmin/edit_user.cgi
+++ b/cluster-useradmin/edit_user.cgi
@@ -429,11 +429,11 @@ if (@icons < @hosts) {
 	      "value=\"$text{'uedit_sync'}\"></td>\n";
 	}
 
-print "</form><form action=\"delete_user.cgi\">\n";
+print "</tr></table></form><p><form action=\"delete_user.cgi\">\n";
 print "<input type=hidden name=user value=\"$uinfo{'user'}\">\n";
-print "<td align=right><input type=submit ",
-      "value=\"$text{'delete'}\"></td> </tr>\n";
-print "</form></table><p>\n";
+print "<input type=submit ",
+      "value=\"$text{'delete'}\">\n";
+print "</form><p>\n";
 
 print &ui_hr();
 print &ui_subheading($text{'uedit_hosts'});
diff --git a/cluster-useradmin/index.cgi b/cluster-useradmin/index.cgi
index 06ae0b38d..28cde17f6 100755
--- a/cluster-useradmin/index.cgi
+++ b/cluster-useradmin/index.cgi
@@ -68,7 +68,7 @@ else {
 	print "<b>$text{'index_nohosts'}</b><p>\n";
 	}
 $formno++;
-print "<form action=add.cgi>\n";
+print "<br><br><form action=add.cgi>\n";
 print "<table width=100%><tr>\n";
 @addservers = grep { !$gothost{$_->{'id'}} } @servers;
 if (@addservers) {