diff --git a/software/edit_pack.cgi b/software/edit_pack.cgi
index 631edd4a4..14019872e 100755
--- a/software/edit_pack.cgi
+++ b/software/edit_pack.cgi
@@ -10,29 +10,29 @@ $pinfo[0] || &error($text{'edit_egone'});
 &ui_print_header(undef, $text{'edit_title'}, "", "edit_pack");
 
 @pinfo = &show_package_info($in{'package'}, $in{'version'}, 1);
-print "<table><tr>\n";
+print &ui_buttons_start();
 
 # Show button to list files, if supported
 if (!$pinfo[8]) {
-	print &ui_form_start("list_pack.cgi");
-	print &ui_hidden("package", $pinfo[0]);
-	print &ui_hidden("version", $pinfo[4]);
-	print &ui_hidden("search", $in{'search'});
-	print "<td>",&ui_submit($text{'edit_list'}),"</td>\n";
-	print &ui_form_end();
+	print &ui_buttons_row("list_pack.cgi",
+		$text{'edit_list'},
+		$text{'edit_listdesc'},
+		&ui_hidden("package", $pinfo[0]).
+		&ui_hidden("version", $pinfo[4]).
+		&ui_hidden("search", $in{'search'}));
 	}
 
 # Show button to un-install (if possible)
 if (!$pinfo[7]) {
-	print &ui_form_start("delete_pack.cgi");
-	print &ui_hidden("package", $pinfo[0]);
-	print &ui_hidden("version", $pinfo[4]);
-	print &ui_hidden("search", $in{'search'});
-	print "<td>",&ui_submit($text{'edit_uninst'}),"</td>\n";
-	print &ui_form_end();
+	print &ui_buttons_row("delete_pack.cgi",
+		$text{'edit_uninst'},
+		$text{'edit_uninstdesc'},
+		&ui_hidden("package", $pinfo[0]).
+		&ui_hidden("version", $pinfo[4]).
+		&ui_hidden("search", $in{'search'}));
 	}
 
-print "</tr></table>\n";
+print &ui_buttons_end();
 
 if ($in{'search'}) {
 	&ui_print_footer("search.cgi?search=$in{'search'}", $text{'search_return'});
diff --git a/software/lang/en b/software/lang/en
index 41940a42c..5d3cf9c25 100644
--- a/software/lang/en
+++ b/software/lang/en
@@ -47,7 +47,9 @@ edit_vend=Vendor
 edit_arch=Architecture
 edit_inst=Installed
 edit_list=List Files
+edit_listdesc=Show all the files in this package, and their current verification state.
 edit_uninst=Uninstall
+edit_uninstdesc=Remove this package from your system.
 edit_return=package details
 edit_egone=Package is no longer installed