diff --git a/firewall/CHANGELOG b/firewall/CHANGELOG
index a57482502..0a9c5e4a3 100644
--- a/firewall/CHANGELOG
+++ b/firewall/CHANGELOG
@@ -38,3 +38,5 @@ Better handle the case where a rule has a --comment format description, but # fo
 Added support for physdev module options, for matching based on the bridged interface.
 ---- Changes since 1.550 ----
 Added the open-ports.pl command which can be run from the shell to open ports on the firewall.
+---- Changes since 1.630 ----
+Updated all screens to use Webmin's new user interface library, for a more consistent look.
diff --git a/firewall/index.cgi b/firewall/index.cgi
index 3347ff670..a96c2dca9 100755
--- a/firewall/index.cgi
+++ b/firewall/index.cgi
@@ -75,15 +75,10 @@ if (!$config{'direct'} &&
 			}
 		print "</center></form><p>\n";
 
-		print "<table border width=100%>\n";
-		print "<tr $tb><td><b>$text{'index_headerex'}</b></td></tr>\n";
-		print "<tr $cb> <td><pre>";
-		open(OUT, "iptables-save 2>/dev/null |");
-		while(<OUT>) {
-			print &html_escape($_);
-			}
-		close(OUT);
-		print "</pre></td> </tr></table>\n";
+		print &ui_table_start($text{'index_headerex'}, "width=100%", 2);
+		$out = &backquote_command("iptables-save 2>/dev/null");
+		print &ui_table_row(undef, "<pre>".&html_escape($out)."</pre>", 2);
+		print &ui_table_end();
 		}
 	else {
 		# Offer to set up a firewall