diff --git a/cluster-software/edit_host.cgi b/cluster-software/edit_host.cgi
index 932bef84c..23aa8cf29 100755
--- a/cluster-software/edit_host.cgi
+++ b/cluster-software/edit_host.cgi
@@ -52,15 +52,17 @@ print "</table></td></tr></table>\n";
 
 # Show delete and refresh buttons
 print "<table width=100%><tr>\n";
-print "<form action=delete_host.cgi>\n";
-print "<input type=hidden name=id value=$in{'id'}>\n";
-print "<td><input type=submit value='$text{'host_delete'}'></td>\n";
-print "</form>\n";
 
-print "<form action=refresh.cgi>\n";
+print "<td><form action=delete_host.cgi>\n";
 print "<input type=hidden name=id value=$in{'id'}>\n";
-print "<td align=right><input type=submit value='$text{'host_refresh'}'></td>\n";
-print "</form>\n";
+print "<input type=submit value='$text{'host_delete'}'>\n";
+print "</form></td>\n";
+
+print "<td align=right><form action=refresh.cgi>\n";
+print "<input type=hidden name=id value=$in{'id'}>\n";
+print "<input type=submit value='$text{'host_refresh'}'>\n";
+print "</form></td>\n";
+
 print "</tr></table>\n";
 
 # Show tree of packages
diff --git a/cluster-software/index.cgi b/cluster-software/index.cgi
index 86d96e567..acb392b45 100755
--- a/cluster-software/index.cgi
+++ b/cluster-software/index.cgi
@@ -82,11 +82,11 @@ if (@addservers && $access{'add'}) {
 
 # Show button for compare form
 if (@hosts) {
-	print "<form action=compare_form.cgi>\n";
 	print "<td align=center width=33%>\n";
+	print "<form action=compare_form.cgi>\n";
 	print "<input type=submit value='$text{'index_compare'}'>\n";
-	print "</td>\n";
 	print "</form>\n";
+	print "</td>\n";
 	}
 
 # Show form for adding a group of servers