diff --git a/cluster-shell/index.cgi b/cluster-shell/index.cgi
index 5c0ae0b6a..d3943ebbb 100755
--- a/cluster-shell/index.cgi
+++ b/cluster-shell/index.cgi
@@ -6,51 +6,39 @@
 require './cluster-shell-lib.pl';
 &ui_print_header(undef, $text{'index_title'}, "", "intro", 0, 1);
 
-print "<form action=run.cgi method=post>\n";
-print "<table>\n";
+print &ui_form_start("run.cgi", "post");
+print &ui_table_start(undef, undef, 2);
 
-print "<tr> <td><b>$text{'index_cmd'}</b></td>\n";
-print "<td><input name=cmd size=60></td> </tr>\n";
+print &ui_table_row($text{'index_cmd'},
+	&ui_textbox("cmd", undef, 60));
 
 open(COMMANDS, $commands_file);
 chop(@commands = <COMMANDS>);
 close(COMMANDS);
 if (@commands) {
-	print "<tr> <td align=right><b>$text{'index_old'}</b></td>\n";
-	print "<td><select name=old>\n";
-	foreach $c (&unique(@commands)) {
-		print "<option>$c\n";
-		}
-	print "</select> <input type=submit name=clear ",
-	      "value='$text{'index_clear'}'></td> </tr>\n";
+	print &ui_table_row($text{'index_old'},
+		&ui_select("old", undef, [ &unique(@commands) ])." ".
+		&ui_submit($text{'index_clear'}, "clear"));
 	}
 
-%serv = map { $_, 1 } split(/ /, $config{'server'});
-print "<tr> <td valign=top><b>$text{'index_server'}</b></td>\n";
-print "<td><select multiple size=5 name=server>\n";
-printf "<option value=ALL %s>%s\n",
-	$serv{'ALL'} ? 'selected' : '', $text{'index_all'};
-printf "<option value=* %s>%s\n",
-	$serv{'*'} ? 'selected' : '', $text{'index_this'};
+@opts = ( [ "ALL", $text{'index_all'} ],
+	  [ "*", $text{'index_this'} ] );
 foreach $s (grep { $_->{'user'} }
 		 sort { $a->{'host'} cmp $b->{'host'} }
 		      &servers::list_servers()) {
-	printf "<option value=%s %s>%s\n",
-		$s->{'host'}, $serv{$s->{'host'}} ? "selected" : "",
-		$s->{'host'}.($s->{'desc'} ? " (".$s->{'desc'}.")" : "");
+	push(@opts, [ $s->{'host'},
+	      $s->{'host'}.($s->{'desc'} ? " (".$s->{'desc'}.")" : "") ]);
 	}
 foreach $g (&servers::list_all_groups()) {
 	$gn = "group_".$g->{'name'};
-	printf "<option value=%s %s>%s\n",
-		$gn, $serv{$gn} ? "selected" : "",
-		&text('index_group', $g->{'name'});
+	push(@opts, [ $gn, &text('index_group', $g->{'name'}) ]);
 	}
-print "</select></td> </tr>\n";
+print &ui_table_row($text{'index_server'},
+	&ui_select("server", [ split(/ /, $config{'server'}) ],
+		   \@opts, 10, 1));
 
-print "<tr>\n";
-print "<td colspan=2><input type=submit value='$text{'index_run'}'></td> </tr>\n";
-
-print "</table></form>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'index_run'} ] ]);
 
 &ui_print_footer("/", $text{'index'});