From 060ed23871a0933021e68078efceb6ed64658d82 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Wed, 13 Jan 2016 15:11:23 -0500
Subject: Fixed #5566

---
 src/usr/local/www/diag_tables.php                |  54 ++++----
 src/usr/local/www/firewall_nat_npt.php           |  75 ++++++------
 src/usr/local/www/firewall_shaper_vinterface.php |   1 -
 src/usr/local/www/interfaces_bridge.php          |  75 ++++++------
 src/usr/local/www/interfaces_gif.php             |  62 +++++-----
 src/usr/local/www/interfaces_gre.php             |  61 +++++-----
 src/usr/local/www/interfaces_groups.php          |  59 +++++----
 src/usr/local/www/interfaces_lagg.php            |  76 ++++++------
 src/usr/local/www/interfaces_ppps.php            |  76 ++++++------
 src/usr/local/www/interfaces_qinq.php            |  71 ++++++-----
 src/usr/local/www/interfaces_vlan.php            |  65 +++++-----
 src/usr/local/www/interfaces_wireless.php        |  74 +++++------
 src/usr/local/www/services_dyndns.php            |  73 +++++------
 src/usr/local/www/services_igmpproxy.php         |  76 ++++++------
 src/usr/local/www/services_rfc2136.php           | 101 +++++++--------
 src/usr/local/www/status_gateway_groups.php      |  80 ++++++------
 src/usr/local/www/status_upnp.php                |  70 ++++++-----
 src/usr/local/www/system_authservers.php         |  73 +++++------
 src/usr/local/www/system_camanager.php           |  77 ++++++------
 src/usr/local/www/system_certmanager.php         | 149 ++++++++++++-----------
 src/usr/local/www/system_gateway_groups.php      |  68 ++++++-----
 src/usr/local/www/system_gateways.php            |  87 +++++++------
 src/usr/local/www/system_groupmanager.php        |  79 ++++++------
 src/usr/local/www/system_routes.php              |  95 ++++++++-------
 src/usr/local/www/system_usermanager.php         |  67 +++++-----
 src/usr/local/www/vpn_ipsec_keys.php             | 125 ++++++++++---------
 src/usr/local/www/vpn_l2tp_users.php             |  56 +++++----
 27 files changed, 1071 insertions(+), 954 deletions(-)

diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php
index a90442a..d66e21a 100644
--- a/src/usr/local/www/diag_tables.php
+++ b/src/usr/local/www/diag_tables.php
@@ -126,6 +126,12 @@ if ($savemsg) {
 	print_info_box($savemsg, 'success');
 }
 
+if ($tablename == "webConfiguratorlockout") {
+	$displayname = "Web configurator lockout table";
+} else {
+	$displayname = ucfirst($tablename) . " table";
+}
+
 $form = new Form(false);
 
 $section = new Form_Section('Table to display');
@@ -202,33 +208,39 @@ events.push(function() {
 //]]>
 </script>
 
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext("IP Address")?></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=$displayname?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext("IP Address")?></th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 		foreach ($entries as $entry):
 			$entry = trim($entry);
 ?>
-			<tr>
-				<td>
-					<?=$entry?>
-				</td>
-				<td>
-					<?php if (!$bogons): ?>
-						<a class="btn btn-xs btn-default" data-entry="<?=htmlspecialchars($entry)?>">Remove</a>
-					<?php endif ?>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=$entry?>
+						</td>
+						<td>
+							<?php if (!$bogons): ?>
+								<a class="btn btn-xs btn-default" data-entry="<?=htmlspecialchars($entry)?>">Remove</a>
+							<?php endif ?>
+						</td>
+					</tr>
 <?php endforeach ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
+
 <?php if (empty($entries)): ?>
 	<div class="alert alert-warning" role="alert">No entries exist in this table</div>
 <?php endif ?>
diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php
index 3c3f441..2e62fba 100644
--- a/src/usr/local/www/firewall_nat_npt.php
+++ b/src/usr/local/www/firewall_nat_npt.php
@@ -119,28 +119,30 @@ $tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
 $tab_array[] = array(gettext("NPt"), true, "firewall_nat_npt.php");
 display_top_tabs($tab_array);
 ?>
-
-<div class="panel-body table responsive">
-	<form method="post">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext("Interface")?></th>
-				<th><?=gettext("External Prefix")?></th>
-				<th><?=gettext("Internal prefix")?></th>
-				<th><?=gettext("Description")?></th>
-				<th><!-- Buttons --></th>
-			</tr>
-		</thead>
-		<tbody class="user-entries">
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('NPt mappings')?></h2></div>
+	<div class="panel-body">
+		<div class="table responsive">
+			<form method="post">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext("Interface")?></th>
+						<th><?=gettext("External Prefix")?></th>
+						<th><?=gettext("Internal prefix")?></th>
+						<th><?=gettext("Description")?></th>
+						<th><!-- Buttons --></th>
+					</tr>
+				</thead>
+				<tbody class="user-entries">
 <?php
 
 $i = 0;
 foreach ($a_npt as $natent):
 ?>
-			<tr<?=isset($natent['disabled'])? ' class="disabled"' : ''?>>
-				<td>
-					<input type="hidden" name="rule[]" value="<?=$i?>" />
+					<tr<?=isset($natent['disabled'])? ' class="disabled"' : ''?>>
+						<td>
+							<input type="hidden" name="rule[]" value="<?=$i?>" />
 <?php
 	if (!$natent['interface']) {
 		print(htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan")));
@@ -155,27 +157,30 @@ foreach ($a_npt as $natent):
 	$destination_net = pprint_address($natent['destination']);
 	$destination_cidr = strstr($destination_net, '/');
 ?>
-				<td>
-					<?=$destination_net?>
-				</td>
-				<td>
-					<?=$source_net?>
-				</td>
-				<td>
-					<?=htmlspecialchars($natent['descr'])?>
-				</td>
-				<td>
-					<a href="firewall_nat_npt_edit.php?id=<?=$i?>" class="btn btn-xs btn-info"><?=gettext("Edit")?></a>
-					<a href="firewall_nat_npt.php?act=del&amp;id=<?=$i?>" class="btn btn-xs btn-danger"><?=gettext("Delete")?></a>
-				</td>
-			</tr>
+						<td>
+							<?=$destination_net?>
+						</td>
+						<td>
+							<?=$source_net?>
+						</td>
+						<td>
+							<?=htmlspecialchars($natent['descr'])?>
+						</td>
+						<td>
+							<a href="firewall_nat_npt_edit.php?id=<?=$i?>" class="btn btn-xs btn-info"><?=gettext("Edit")?></a>
+							<a href="firewall_nat_npt.php?act=del&amp;id=<?=$i?>" class="btn btn-xs btn-danger"><?=gettext("Delete")?></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 endforeach;
 ?>
-		</tbody>
-	</table>
-</form>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+
 
 <nav class="action-buttons">
 	<a href="firewall_nat_npt_edit.php" class="btn btn-sm btn-success">
@@ -187,8 +192,8 @@ endforeach;
 		<?=gettext("Save")?>
 	</button>
 </nav>
+</form>
 
-</div>
 <script type="text/javascript">
 //<![CDATA[
 events.push(function() {
diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php
index f1e7165..7ebe0ab 100644
--- a/src/usr/local/www/firewall_shaper_vinterface.php
+++ b/src/usr/local/www/firewall_shaper_vinterface.php
@@ -418,7 +418,6 @@ $tab_array[] = array(gettext("Limiter"), true, "firewall_shaper_vinterface.php")
 $tab_array[] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
 display_top_tabs($tab_array);
 ?>
-
 <div class="table-responsive">
 	<table class="table">
 		<tbody>
diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php
index 9a45bc6..6dc9c2f 100644
--- a/src/usr/local/www/interfaces_bridge.php
+++ b/src/usr/local/www/interfaces_bridge.php
@@ -126,18 +126,20 @@ $tab_array[] = array(gettext("Bridges"), true, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-			  <th><?=gettext("Interface"); ?></th>
-			  <th><?=gettext("Members"); ?></th>
-			  <th><?=gettext("Description"); ?></th>
-			  <th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Bridge interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+					  <th><?=gettext("Interface"); ?></th>
+					  <th><?=gettext("Members"); ?></th>
+					  <th><?=gettext("Description"); ?></th>
+					  <th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 
 $i = 0;
@@ -145,11 +147,11 @@ $ifdescrs = get_configured_interface_with_descr();
 
 foreach ($a_bridges as $bridge) {
 ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars(strtoupper($bridge['bridgeif']))?>
-				</td>
-				<td>
+					<tr>
+						<td>
+							<?=htmlspecialchars(strtoupper($bridge['bridgeif']))?>
+						</td>
+						<td>
 <?php
 	$members = explode(',', $bridge['members']);
 	$j = 0;
@@ -163,29 +165,30 @@ foreach ($a_bridges as $bridge) {
 		}
 	}
 ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($bridge['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit interface bridge')?>"	href="interfaces_bridge_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete interface bridge')?>"	href="interfaces_bridge.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+						</td>
+						<td>
+							<?=htmlspecialchars($bridge['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit interface bridge')?>"	href="interfaces_bridge_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete interface bridge')?>"	href="interfaces_bridge.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 }
 ?>
-		</tbody>
-	</table>
-
-	<nav class="action-buttons">
-		<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus icon-embed-btn"></i>
-			<?=gettext("Add")?>
-		</a>
-	</nav>
-
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
+<nav class="action-buttons">
+	<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm">
+		<i class="fa fa-plus icon-embed-btn"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
+
 <?php include("foot.inc");
diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php
index dd56647..f4048d7 100644
--- a/src/usr/local/www/interfaces_gif.php
+++ b/src/usr/local/www/interfaces_gif.php
@@ -121,37 +121,41 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext("Interface"); ?></th>
-				<th><?=gettext("Tunnel to &hellip;"); ?></th>
-				<th><?=gettext("Description"); ?></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('GIF interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext("Interface"); ?></th>
+						<th><?=gettext("Tunnel to &hellip;"); ?></th>
+						<th><?=gettext("Description"); ?></th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php foreach ($a_gifs as $i => $gif): ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gif['if']))?>
-				</td>
-				<td>
-					<?=htmlspecialchars($gif['remote-addr'])?>
-				</td>
-				<td>
-					<?=htmlspecialchars($gif['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit GIF interface')?>"	href="interfaces_gif_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete GIF interface')?>"	href="interfaces_gif.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gif['if']))?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gif['remote-addr'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gif['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit GIF interface')?>"	href="interfaces_gif_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete GIF interface')?>"	href="interfaces_gif.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php endforeach; ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 00a2397..e22a908 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -121,36 +121,41 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext("Interface"); ?></th>
-				<th><?=gettext("Tunnel to &hellip;"); ?></th>
-				<th><?=gettext("Description"); ?></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('GRE interfacess')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext("Interface"); ?></th>
+						<th><?=gettext("Tunnel to &hellip;"); ?></th>
+						<th><?=gettext("Description"); ?></th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php foreach ($a_gres as $i => $gre): ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']))?>
-				</td>
-				<td>
-					<?=htmlspecialchars($gre['remote-addr'])?>
-				</td>
-				<td>
-					<?=htmlspecialchars($gre['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit GRE interface')?>"	href="interfaces_gre_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete GRE interface')?>"	href="interfaces_gre.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']))?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gre['remote-addr'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gre['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit GRE interface')?>"	href="interfaces_gre_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete GRE interface')?>"	href="interfaces_gre.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php endforeach; ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php
index 90a992d..39d5571 100644
--- a/src/usr/local/www/interfaces_groups.php
+++ b/src/usr/local/www/interfaces_groups.php
@@ -103,23 +103,26 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext('Name');?></th>
-				<th><?=gettext('Members');?></th>
-				<th><?=gettext('Description');?></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Interface groups')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext('Name');?></th>
+						<th><?=gettext('Members');?></th>
+						<th><?=gettext('Description');?></th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php foreach ($a_ifgroups as $i => $ifgroupentry): ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($ifgroupentry['ifname']); ?>
-				</td>
-				<td>
+					<tr>
+						<td>
+							<?=htmlspecialchars($ifgroupentry['ifname']); ?>
+						</td>
+						<td>
 <?php
 		$members_arr = explode(" ", $ifgroupentry['members']);
 		$iflist = get_configured_interface_with_descr(false, true);
@@ -135,18 +138,20 @@ display_top_tabs($tab_array);
 			echo '&hellip;';
 		}
 ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($ifgroupentry['descr']);?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit group')?>"	href="interfaces_groups_edit.php?id=<?=$i; ?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete group')?>"	href="interfaces_groups.php?act=del&amp;id=<?=$i; ?>"></a>
-				</td>
-			</tr>
+						</td>
+						<td>
+							<?=htmlspecialchars($ifgroupentry['descr']);?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit group')?>"	href="interfaces_groups_edit.php?id=<?=$i; ?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete group')?>"	href="interfaces_groups.php?act=del&amp;id=<?=$i; ?>"></a>
+						</td>
+					</tr>
 <?php endforeach; ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php
index 72c9c9f..84c5abd 100644
--- a/src/usr/local/www/interfaces_lagg.php
+++ b/src/usr/local/www/interfaces_lagg.php
@@ -128,51 +128,57 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), true, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-			  <th><?=gettext("Interface"); ?></th>
-			  <th><?=gettext("Members"); ?></th>
-			  <th><?=gettext("Description"); ?></th>
-			  <th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('LAGG interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+					  <th><?=gettext("Interface"); ?></th>
+					  <th><?=gettext("Members"); ?></th>
+					  <th><?=gettext("Description"); ?></th>
+					  <th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 
 $i = 0;
 
 foreach ($a_laggs as $lagg) {
 ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars(strtoupper($lagg['laggif']))?>
-				</td>
-				<td>
-					<?=htmlspecialchars($lagg['members'])?>
-				</td>
-				<td>
-					<?=htmlspecialchars($lagg['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit LAGG interface')?>"	href="interfaces_lagg_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete LAGG interface')?>"	href="interfaces_lagg.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars(strtoupper($lagg['laggif']))?>
+						</td>
+						<td>
+							<?=htmlspecialchars($lagg['members'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($lagg['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit LAGG interface')?>"	href="interfaces_lagg_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete LAGG interface')?>"	href="interfaces_lagg.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 }
 ?>
-		</tbody>
-	</table>
-
-	 <nav class="action-buttons">
-		<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus icon-embed-btn"></i>
-			<?=gettext("Add")?>
-		</a>
-	</nav>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
+
+ <nav class="action-buttons">
+	<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm">
+		<i class="fa fa-plus icon-embed-btn"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
+
 <?php
 include("foot.inc");
diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php
index 6804743..e4623ab 100644
--- a/src/usr/local/www/interfaces_ppps.php
+++ b/src/usr/local/www/interfaces_ppps.php
@@ -120,28 +120,31 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-			  <th><?=gettext("Interface"); ?></th>
-			  <th><?=gettext("Interface(s)/Port(s)"); ?></th>
-			  <th><?=gettext("Description"); ?></th>
-			  <th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('PPPS interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+					  <th><?=gettext("Interface"); ?></th>
+					  <th><?=gettext("Interface(s)/Port(s)"); ?></th>
+					  <th><?=gettext("Description"); ?></th>
+					  <th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 
 $i = 0;
 
 foreach ($a_ppps as $id => $ppp) {
 ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($ppp['if'])?>
-				</td>
-				<td>
+					<tr>
+						<td>
+							<?=htmlspecialchars($ppp['if'])?>
+						</td>
+						<td>
 <?php
 	$portlist = explode(",", $ppp['ports']);
 	foreach ($portlist as $portid => $port) {
@@ -149,31 +152,34 @@ foreach ($a_ppps as $id => $ppp) {
 			$portlist[$portid] = convert_friendly_interface_to_friendly_descr($port);
 		}
 	}
-					echo htmlspecialchars(implode(",", $portlist));
+							echo htmlspecialchars(implode(",", $portlist));
 ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($ppp['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit PPP interface')?>"	href="interfaces_ppps_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete PPP interface')?>"	href="interfaces_ppps.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+						</td>
+						<td>
+							<?=htmlspecialchars($ppp['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit PPP interface')?>"	href="interfaces_ppps_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete PPP interface')?>"	href="interfaces_ppps.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 }
 ?>
-		</tbody>
-	</table>
-
-	<nav class="action-buttons">
-		<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm">
-	   		<i class="fa fa-plus icon-embed-btn"></i>
-	   		<?=gettext("Add")?>
-	   	</a>
-	</nav>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
+
+<nav class="action-buttons">
+	<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm">
+		<i class="fa fa-plus icon-embed-btn"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
+
 <?php
 include("foot.inc");
 
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index a7a47bf..ebdd0a2 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -133,46 +133,51 @@ $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-			  <th><?=gettext("Interface"); ?></th>
-			  <th><?=gettext("Tag");?></td>
-			  <th><?=gettext("QinQ members"); ?></th>
-			  <th><?=gettext("Description"); ?></th>
-			  <th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('QinQ interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+					  <th><?=gettext("Interface"); ?></th>
+					  <th><?=gettext("Tag");?></td>
+					  <th><?=gettext("QinQ members"); ?></th>
+					  <th><?=gettext("Description"); ?></th>
+					  <th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php foreach ($a_qinqs as $i => $qinq):?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($qinq['if'])?>
-				</td>
-				<td>
-					<?=htmlspecialchars($qinq['tag'])?>
-				</td>
-				<td>
+					<tr>
+						<td>
+							<?=htmlspecialchars($qinq['if'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($qinq['tag'])?>
+						</td>
+						<td>
 <?php if (strlen($qinq['members']) > 20):?>
-					<?=substr(htmlspecialchars($qinq['members']), 0, 20)?>&hellip;
+							<?=substr(htmlspecialchars($qinq['members']), 0, 20)?>&hellip;
 <?php else:?>
-					<?=htmlspecialchars($qinq['members'])?>
+							<?=htmlspecialchars($qinq['members'])?>
 <?php endif; ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($qinq['descr'])?>&nbsp;
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit Q-in-Q interface')?>"	href="interfaces_qinq_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete Q-in-Q interface')?>"	href="interfaces_qinq.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+						</td>
+						<td>
+							<?=htmlspecialchars($qinq['descr'])?>&nbsp;
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit Q-in-Q interface')?>"	href="interfaces_qinq_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete Q-in-Q interface')?>"	href="interfaces_qinq.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php
 endforeach;
 ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php
index 0f82756..c3ea2f8 100644
--- a/src/usr/local/www/interfaces_vlan.php
+++ b/src/usr/local/www/interfaces_vlan.php
@@ -130,44 +130,53 @@ display_top_tabs($tab_array);
 	<input id="act" type="hidden" name="act" value="" />
 	<input id="id" type="hidden" name="id" value=""/>
 
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed">
-			<thead>
-				<tr>
-					<th><?=gettext('Interface');?></th>
-					<th><?=gettext('VLAN tag');?></th>
-					<th><?=gettext('Priority');?></th>
-					<th><?=gettext('Description');?></th>
-					<th></th>
-				</tr>
-			</thead>
+	<div class="panel panel-default">
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('VLAN interfaces')?></h2></div>
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped table-hover table-condensed">
+					<thead>
+						<tr>
+							<th><?=gettext('Interface');?></th>
+							<th><?=gettext('VLAN tag');?></th>
+							<th><?=gettext('Priority');?></th>
+							<th><?=gettext('Description');?></th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
 <?php
 	$i = 0;
 	foreach ($a_vlans as $vlan) {
 ?>
-				<tr>
-					<td><?=htmlspecialchars($vlan['if']);?></td>
-					<td><?=htmlspecialchars($vlan['tag']);?></td>
-					<td><?=htmlspecialchars($vlan['pcp']);?></td>
-					<td><?=htmlspecialchars($vlan['descr']);?></td>
-					<td>
-						<a class="fa fa-pencil"	title="<?=gettext('Edit VLAN')?>"	role="button" href="interfaces_vlan_edit.php?id=<?=$i?>"></a>
+						<tr>
+							<td><?=htmlspecialchars($vlan['if']);?></td>
+							<td><?=htmlspecialchars($vlan['tag']);?></td>
+							<td><?=htmlspecialchars($vlan['pcp']);?></td>
+							<td><?=htmlspecialchars($vlan['descr']);?></td>
+							<td>
+								<a class="fa fa-pencil"	title="<?=gettext('Edit VLAN')?>"	role="button" href="interfaces_vlan_edit.php?id=<?=$i?>"></a>
 <!--						<a class="btn btn-danger btn-xs" role="button" href="interfaces_vlan.php?act=del&amp;id=<?=$i?>"><?=gettext('Delete')?></a></td> -->
-						<a class="fa fa-trash"	title="<?=gettext('Delete VLAN')?>"	role="button" id="del-<?=$i?>"></a>
-					</td>
-				</tr>
+								<a class="fa fa-trash"	title="<?=gettext('Delete VLAN')?>"	role="button" id="del-<?=$i?>"></a>
+							</td>
+						</tr>
 <?php
 			$i++;
 	}
 ?>
-		</table>
-		<nav class="action-buttons">
-			<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php">
-				<i class="fa fa-plus icon-embed-btn"></i>
-				<?=gettext('Add'); ?>
-			</a>
-		</nav>
+					</tbody>
+				</table>
+			</div>
+		</div>
 	</div>
+
+	<nav class="action-buttons">
+		<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php">
+			<i class="fa fa-plus icon-embed-btn"></i>
+			<?=gettext('Add'); ?>
+		</a>
+	</nav>
+
 </form>
 
 <div class="infoblock">
diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php
index 7ddbfa1..d6c9489 100644
--- a/src/usr/local/www/interfaces_wireless.php
+++ b/src/usr/local/www/interfaces_wireless.php
@@ -125,51 +125,55 @@ $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php");
 $tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php");
 display_top_tabs($tab_array);
 ?>
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-			  <th><?=gettext("Interface"); ?></th>
-			  <th><?=gettext("Mode"); ?></th>
-			  <th><?=gettext("Description"); ?></th>
-			  <th></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Wireless interfaces')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+					  <th><?=gettext("Interface"); ?></th>
+					  <th><?=gettext("Mode"); ?></th>
+					  <th><?=gettext("Description"); ?></th>
+					  <th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 
 $i = 0;
 
 foreach ($a_clones as $clone) {
 ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($clone['cloneif'])?>
-				</td>
-				<td>
-					<?= $wlan_modes[$clone['mode']]; ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($clone['descr'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit WiFi interface')?>"	href="interfaces_wireless_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete WiFi interface')?>"	href="interfaces_wireless.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars($clone['cloneif'])?>
+						</td>
+						<td>
+							<?= $wlan_modes[$clone['mode']]; ?>
+						</td>
+						<td>
+							<?=htmlspecialchars($clone['descr'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit WiFi interface')?>"	href="interfaces_wireless_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete WiFi interface')?>"	href="interfaces_wireless.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 }
 ?>
-		</tbody>
-	</table>
-
-	<nav class="action-buttons">
-		<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus icon-embed-btn"></i>
-			<?=gettext("Add")?></a>
-	</nav>
+				</tbody>
+			</table>
+
+			<nav class="action-buttons">
+				<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm">
+					<i class="fa fa-plus icon-embed-btn"></i>
+					<?=gettext("Add")?></a>
+			</nav>
+		</div>
+	</div>
 </div>
 <?php
 include("foot.inc");
diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php
index 234f5f9..3545558 100644
--- a/src/usr/local/www/services_dyndns.php
+++ b/src/usr/local/www/services_dyndns.php
@@ -92,7 +92,7 @@ if ($_GET['act'] == "del") {
 		exit;
 	}
 }
-$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Clients"));
+$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Clients"));
 include("head.inc");
 
 if ($input_errors) {
@@ -105,25 +105,28 @@ $tab_array[] = array(gettext("RFC 2136"), false, "services_rfc2136.php");
 display_top_tabs($tab_array);
 ?>
 <form action="services_dyndns.php" method="post" name="iform" id="iform">
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed">
-			<thead>
-				<tr>
-					<th><?=gettext("Interface")?></th>
-					<th><?=gettext("Service")?></th>
-					<th><?=gettext("Hostname")?></th>
-					<th><?=gettext("Cached IP")?></th>
-					<th><?=gettext("Description")?></th>
-					<th><?=gettext("Actions")?></th>
-				</tr>
-			</thead>
-			<tbody>
+	<div class="panel panel-default">
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Dynamic DNS clients')?></h2></div>
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped table-hover table-condensed">
+					<thead>
+						<tr>
+							<th><?=gettext("Interface")?></th>
+							<th><?=gettext("Service")?></th>
+							<th><?=gettext("Hostname")?></th>
+							<th><?=gettext("Cached IP")?></th>
+							<th><?=gettext("Description")?></th>
+							<th><?=gettext("Actions")?></th>
+						</tr>
+					</thead>
+					<tbody>
 <?php
 $i = 0;
 foreach ($a_dyndns as $dyndns):
 ?>
-				<tr<?=!isset($dyndns['enable'])?' class="disabled"':''?>>
-					<td>
+						<tr<?=!isset($dyndns['enable'])?' class="disabled"':''?>>
+							<td>
 <?php
 	$iflist = get_configured_interface_with_descr();
 	foreach ($iflist as $if => $ifdesc) {
@@ -142,8 +145,8 @@ foreach ($a_dyndns as $dyndns):
 		}
 	}
 ?>
-					</td>
-					<td>
+							</td>
+							<td>
 <?php
 	$types = explode(",", DYNDNS_PROVIDER_DESCRIPTIONS);
 	$vals = explode(" ", DYNDNS_PROVIDER_VALUES);
@@ -156,13 +159,13 @@ foreach ($a_dyndns as $dyndns):
 		}
 	}
 ?>
-					</td>
-					<td>
+							</td>
+							<td>
 <?php
 	print(htmlspecialchars($dyndns['host']));
 ?>
-					</td>
-					<td>
+							</td>
+							<td>
 <?php
 	$filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache";
 	$filename_v6 = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}_v6.cache";
@@ -196,31 +199,33 @@ foreach ($a_dyndns as $dyndns):
 		print('N/A');
 	}
 ?>
-					</td>
-					<td>
+							</td>
+							<td>
 <?php
 	print(htmlspecialchars($dyndns['descr']));
 ?>
-					</td>
-					<td>
-						<a class="fa fa-pencil" title="<?=gettext('Edit service')?>" href="services_dyndns_edit.php?id=<?=$i?>"></a>
+							</td>
+							<td>
+								<a class="fa fa-pencil" title="<?=gettext('Edit service')?>" href="services_dyndns_edit.php?id=<?=$i?>"></a>
 <?php if (isset($dyndns['enable'])) {
 ?>
-						<a class="fa fa-ban" title="<?=gettext('Disable service')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
+								<a class="fa fa-ban" title="<?=gettext('Disable service')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
 <?php } else {
 ?>
-						<a class="fa fa-check-square-o" title="<?=gettext('Enable service')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
+								<a class="fa fa-check-square-o" title="<?=gettext('Enable service')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
 <?php }
 ?>
-						<a class="fa fa-trash" title="<?=gettext('Delete service')?>"	href="services_dyndns.php?act=del&amp;id=<?=$i?>"></a>
-					</td>
-				</tr>
+								<a class="fa fa-trash" title="<?=gettext('Delete service')?>"	href="services_dyndns.php?act=del&amp;id=<?=$i?>"></a>
+							</td>
+						</tr>
 <?php
 	$i++;
 	endforeach;
 ?>
-			</tbody>
-	  </table>
+					</tbody>
+			  </table>
+			</div>
+		</div>
 	</div>
 </form>
 
diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php
index 89ddf68..840db21 100644
--- a/src/usr/local/www/services_igmpproxy.php
+++ b/src/usr/local/www/services_igmpproxy.php
@@ -111,35 +111,33 @@ if (is_subsystem_dirty('igmpproxy')) {
 ?>
 
 <form action="services_igmpproxy.php" method="post">
-
-<div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title"><?=gettext('IGMP Proxy')?></h2></div>
-	<div class="panel-body">
-
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed">
-			<thead>
-				<tr>
-					<th><?=gettext("Name")?></th>
-					<th><?=gettext("Type")?></th>
-					<th><?=gettext("Values")?></th>
-					<th><?=gettext("Description")?></th>
-					<th></th>
-				</tr>
-			</thead>
-			<tbody>
+	<div class="panel panel-default">
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('IGMP Proxy')?></h2></div>
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped table-hover table-condensed">
+					<thead>
+						<tr>
+							<th><?=gettext("Name")?></th>
+							<th><?=gettext("Type")?></th>
+							<th><?=gettext("Values")?></th>
+							<th><?=gettext("Description")?></th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
 <?php
 $i = 0;
 foreach ($a_igmpproxy as $igmpentry):
 ?>
-				<tr>
-					<td>
-						<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($igmpentry['ifname']))?>
-					</td>
-					<td>
-						<?=htmlspecialchars($igmpentry['type'])?>
-					</td>
-					<td>
+						<tr>
+							<td>
+								<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($igmpentry['ifname']))?>
+							</td>
+							<td>
+								<?=htmlspecialchars($igmpentry['type'])?>
+							</td>
+							<td>
 <?php
 	$addresses = implode(", ", array_slice(explode(" ", $igmpentry['address']), 0, 10));
 	print($addresses);
@@ -150,26 +148,24 @@ foreach ($a_igmpproxy as $igmpentry):
 		print('...');
 	}
 ?>
-					</td>
-					<td>
-						<?=htmlspecialchars($igmpentry['descr'])?>&nbsp;
-					</td>
-					<td>
-						<a class="fa fa-pencil"	title="<?=gettext('Edit IGMP entry')?>" href="services_igmpproxy_edit.php?id=<?=$i?>"></a>
-						<a class="fa fa-trash"	title="<?=gettext('Delete IGMP entry')?>" href="services_igmpproxy.php?act=del&amp;id=<?=$i?>"></a>
-					</td>
-				</tr>
+							</td>
+							<td>
+								<?=htmlspecialchars($igmpentry['descr'])?>&nbsp;
+							</td>
+							<td>
+								<a class="fa fa-pencil"	title="<?=gettext('Edit IGMP entry')?>" href="services_igmpproxy_edit.php?id=<?=$i?>"></a>
+								<a class="fa fa-trash"	title="<?=gettext('Delete IGMP entry')?>" href="services_igmpproxy.php?act=del&amp;id=<?=$i?>"></a>
+							</td>
+						</tr>
 <?php
 	$i++;
 endforeach;
 ?>
-			</tbody>
-		</table>
-	</div>
-
+					</tbody>
+				</table>
+			</div>
+		</div>
 	</div>
-</div>
-	
 </form>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php
index 3a01332..31a9270 100644
--- a/src/usr/local/www/services_rfc2136.php
+++ b/src/usr/local/www/services_rfc2136.php
@@ -98,24 +98,27 @@ $tab_array[] = array(gettext("RFC 2136"), true, "services_rfc2136.php");
 display_top_tabs($tab_array);
 
 if ($input_errors) {
-    print_input_errors($input_errors);
+	print_input_errors($input_errors);
 }
 ?>
 
 <form action="services_rfc2136.php" method="post" name="iform" id="iform">
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed">
-			<thead>
-				<tr>
-        		    <th><?=gettext("If")?></th>
-        		    <th><?=gettext("Server")?></th>
-        		    <th><?=gettext("Hostname")?></th>
-        		    <th><?=gettext("Cached IP")?></th>
-        		    <th><?=gettext("Description")?></th>
-		            <th></th>
-		        </tr>
-		    </thead>
-		    <tbody>
+	<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('RFC2136 clients')?></h2></div>
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped table-hover table-condensed">
+					<thead>
+						<tr>
+							<th><?=gettext("IF")?></th>
+							<th><?=gettext("Server")?></th>
+							<th><?=gettext("Hostname")?></th>
+							<th><?=gettext("Cached IP")?></th>
+							<th><?=gettext("Description")?></th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
 <?php
 
 
@@ -124,24 +127,24 @@ $iflist = get_configured_interface_with_descr();
 $i = 0;
 foreach ($a_rfc2136 as $rfc2136):
 ?>
-		        <tr<?=(isset($rfc2136['enable']) ? '' : ' class="disabled"')?>>
-		            <td>
+						<tr<?=(isset($rfc2136['enable']) ? '' : ' class="disabled"')?>>
+							<td>
 <?php
 	foreach ($iflist as $if => $ifdesc) {
-	    if ($rfc2136['interface'] == $if) {
-	        print($ifdesc);
+		if ($rfc2136['interface'] == $if) {
+			print($ifdesc);
 			break;
-	    }
+		}
 	}
 ?>
-		            </td>
-		            <td>
-		                <?=htmlspecialchars($rfc2136['server'])?>
-		            </td>
-		            <td>
-		                <?=htmlspecialchars($rfc2136['host'])?>
-		            </td>
-		            <td>
+							</td>
+							<td>
+								<?=htmlspecialchars($rfc2136['server'])?>
+							</td>
+							<td>
+								<?=htmlspecialchars($rfc2136['host'])?>
+							</td>
+							<td>
 <?php
 	$filename = "{$g['conf_path']}/dyndns_{$rfc2136['interface']}_rfc2136_" . escapeshellarg($rfc2136['host']) . "_{$rfc2136['server']}.cache";
 
@@ -189,30 +192,32 @@ foreach ($a_rfc2136 as $rfc2136):
 	}
 
 ?>
-			</td>
-			<td>
-				<?=htmlspecialchars($rfc2136['descr'])?>
-			</td>
-			<td>
-				<a class="fa fa-pencil"	title="<?=gettext('Edit client')?>" href="services_rfc2136_edit.php?id=<?=$i?>"></a>
-			<?php if (isset($rfc2136['enable'])) {
-			?>
-				<a  class="fa fa-ban" title="<?=gettext('Disable client')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
-			<?php } else {
-			?>
-				<a class="fa fa-check-square-o" title="<?=gettext('Enable client')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
-			<?php }
-			?>
-				<a class="fa fa-trash" title="<?=gettext('Delete client')?>" href="services_rfc2136.php?act=del&amp;id=<?=$i?>"></a>
-			</td>
-			</tr>
+					</td>
+					<td>
+						<?=htmlspecialchars($rfc2136['descr'])?>
+					</td>
+					<td>
+						<a class="fa fa-pencil" title="<?=gettext('Edit client')?>" href="services_rfc2136_edit.php?id=<?=$i?>"></a>
+					<?php if (isset($rfc2136['enable'])) {
+					?>
+						<a	class="fa fa-ban" title="<?=gettext('Disable client')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
+					<?php } else {
+					?>
+						<a class="fa fa-check-square-o" title="<?=gettext('Enable client')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
+					<?php }
+					?>
+						<a class="fa fa-trash" title="<?=gettext('Delete client')?>" href="services_rfc2136.php?act=del&amp;id=<?=$i?>"></a>
+					</td>
+					</tr>
 <?php
-    $i++;
+	$i++;
 endforeach; ?>
 
-		    </tbody>
-        </table>
-    </div>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
 </form>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/status_gateway_groups.php b/src/usr/local/www/status_gateway_groups.php
index d244b88..d9708b4 100755
--- a/src/usr/local/www/status_gateway_groups.php
+++ b/src/usr/local/www/status_gateway_groups.php
@@ -95,24 +95,23 @@ display_top_tabs($tab_array);
 <div class="panel panel-default">
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Gateway Groups')?></h2></div>
 	<div class="panel-body">
-
-<div class="table-responsive">
-	<table class="table table-hover table-condensed table-striped">
-		<thead>
-			<tr>
-				<th><?=gettext("Group Name"); ?></th>
-				<th><?=gettext("Gateways"); ?></th>
-				<th><?=gettext("Description"); ?></th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach ($a_gateway_groups as $gateway_group): ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($gateway_group['name'])?>
-				</td>
-				<td>
-					<table class="table table-bordered table-condensed">
+		<div class="table-responsive">
+			<table class="table table-hover table-condensed table-striped">
+				<thead>
+					<tr>
+						<th><?=gettext("Group Name"); ?></th>
+						<th><?=gettext("Gateways"); ?></th>
+						<th><?=gettext("Description"); ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($a_gateway_groups as $gateway_group): ?>
+					<tr>
+						<td>
+							<?=htmlspecialchars($gateway_group['name'])?>
+						</td>
+						<td>
+							<table class="table table-bordered table-condensed">
 <?php
 						/* process which priorities we have */
 						$priorities = array();
@@ -123,17 +122,17 @@ display_top_tabs($tab_array);
 						$priority_count = count($priorities);
 						ksort($priorities);
 ?>
-						<thead>
-							<tr>
+								<thead>
+									<tr>
 <?php
 							// Make a column for each tier
 							foreach ($priorities as $number => $tier) {
 								echo "<th>" . sprintf(gettext("Tier %s"), $number) . "</th>";
 							}
 ?>
-							</tr>
-						</thead>
-						<tbody>
+									</tr>
+								</thead>
+								<tbody>
 <?php
 							/* inverse gateway group to gateway priority */
 							$priority_arr = array();
@@ -148,7 +147,7 @@ display_top_tabs($tab_array);
 								foreach ($tier as $member) {
 									/* we always have $priority_count fields */
 ?>
-							<tr>
+									<tr>
 <?php
 									$c = 1;
 									while ($c <= $priority_count) {
@@ -176,37 +175,36 @@ display_top_tabs($tab_array);
 												$bgcolor = WHITE;
 											}
 ?>
-								<td bgcolor="<?=$bgcolor?>">
-									<?=htmlspecialchars($member);?>,<br/><?=$online?>
-								</td>
+										<td bgcolor="<?=$bgcolor?>">
+											<?=htmlspecialchars($member);?>,<br/><?=$online?>
+										</td>
 
 <?php
 										} else {
 ?>
-								<td>
-								</td>
+										<td>
+										</td>
 <?php							}
 										$c++;
 									}
 ?>
-							</tr>
+									</tr>
 <?php
 								}
 								$p++;
 							}
 ?>
-						</tbody>
-					</table>
-				</td>
-				<td>
-					<?=htmlspecialchars($gateway_group['descr'])?>
-				</td>
-			</tr>
+								</tbody>
+							</table>
+						</td>
+						<td>
+							<?=htmlspecialchars($gateway_group['descr'])?>
+						</td>
+					</tr>
 			<?php endforeach; ?>
-		</tbody>
-	</table>
-</div>
-
+				</tbody>
+			</table>
+		</div>
 	</div>
 </div>
 
diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php
index bab17eb..070ecae 100644
--- a/src/usr/local/www/status_upnp.php
+++ b/src/usr/local/www/status_upnp.php
@@ -93,19 +93,21 @@ if (!$config['installedpackages'] ||
 
 ?>
 
-<div class="panel-body panel-default">
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
-			<thead>
-				<tr>
-					<th><?=gettext("Port")?></th>
-					<th><?=gettext("Protocol")?></th>
-					<th><?=gettext("Internal IP")?></th>
-					<th><?=gettext("Int. Port")?></th>
-					<th><?=gettext("Description")?></th>
-				</tr>
-			</thead>
-			<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('UPnP rules')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
+				<thead>
+					<tr>
+						<th><?=gettext("Port")?></th>
+						<th><?=gettext("Protocol")?></th>
+						<th><?=gettext("Internal IP")?></th>
+						<th><?=gettext("Int. Port")?></th>
+						<th><?=gettext("Description")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 $i = 0;
 
@@ -118,31 +120,35 @@ foreach ($rdr_entries as $rdr_entry) {
 	$rdr_iport = $matches[6];
 
 ?>
-				<tr>
-					<td>
-						<?=$rdr_port?>
-					</td>
-					<td>
-						<?=$rdr_proto?>
-					</td>
-					<td>
-						<?=$rdr_ip?>
-					</td>
-					<td>
-						<?=$rdr_iport?>
-					</td>
-					<td>
-						<?=$rdr_label?>
-					</td>
-				</tr>
+					<tr>
+						<td>
+							<?=$rdr_port?>
+						</td>
+						<td>
+							<?=$rdr_proto?>
+						</td>
+						<td>
+							<?=$rdr_ip?>
+						</td>
+						<td>
+							<?=$rdr_iport?>
+						</td>
+						<td>
+							<?=$rdr_label?>
+						</td>
+					</tr>
 <?php
 	}
 	$i++;
 }
 ?>
-			</tbody>
-		</table>
+				</tbody>
+			</table>
+		</div>
 	</div>
+</div>
+
+<div>
 	<form action="status_upnp.php" method="post">
 		<nav class="action-buttons">
 			<button class="btn btn-danger btn-sm" type="submit" name="clear" id="clear" value="<?=gettext("Clear all sessions")?>">
diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php
index 9238e66..c1ee41e 100644
--- a/src/usr/local/www/system_authservers.php
+++ b/src/usr/local/www/system_authservers.php
@@ -394,41 +394,46 @@ display_top_tabs($tab_array);
 
 if (!($act == "new" || $act == "edit" || $input_errors))
 {
-	?>
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
-			<thead>
-				<tr>
-					<th><?=gettext("Server Name")?></th>
-					<th><?=gettext("Type")?></th>
-					<th><?=gettext("Host Name")?></th>
-					<th><?=gettext("Actions")?></th>
-				</tr>
-			</thead>
-			<tbody>
-		<?php foreach($a_server as $i => $server): ?>
-				<tr>
-					<td><?=htmlspecialchars($server['name'])?></td>
-					<td><?=htmlspecialchars($auth_server_types[$server['type']])?></td>
-					<td><?=htmlspecialchars($server['host'])?></td>
-					<td>
-					<?php if ($i < (count($a_server) - 1)): ?>
-						<a class="fa fa-pencil" title="<?=gettext("Edit server"); ?>" href="system_authservers.php?act=edit&amp;id=<?=$i?>"></a>
-						<a class="fa fa-trash"  title="<?=gettext("Delete server")?>" href="system_authservers.php?act=del&amp;id=<?=$i?>"></a>
-					<?php endif?>
-					</td>
-				</tr>
-		<?php endforeach; ?>
-			</tbody>
-		</table>
+?>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Authentication servers')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
+				<thead>
+					<tr>
+						<th><?=gettext("Server Name")?></th>
+						<th><?=gettext("Type")?></th>
+						<th><?=gettext("Host Name")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
+			<?php foreach($a_server as $i => $server): ?>
+					<tr>
+						<td><?=htmlspecialchars($server['name'])?></td>
+						<td><?=htmlspecialchars($auth_server_types[$server['type']])?></td>
+						<td><?=htmlspecialchars($server['host'])?></td>
+						<td>
+						<?php if ($i < (count($a_server) - 1)): ?>
+							<a class="fa fa-pencil" title="<?=gettext("Edit server"); ?>" href="system_authservers.php?act=edit&amp;id=<?=$i?>"></a>
+							<a class="fa fa-trash"  title="<?=gettext("Delete server")?>" href="system_authservers.php?act=del&amp;id=<?=$i?>"></a>
+						<?php endif?>
+						</td>
+					</tr>
+			<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
 	</div>
-
-	<nav class="action-buttons">
-		<a href="?act=new" class="btn btn-success btn-sm">
-			<i class="fa fa-plus icon-embed-btn"></i>
-			<?=gettext("Add")?>
-		</a>
-	</nav>
+</div>
+
+<nav class="action-buttons">
+	<a href="?act=new" class="btn btn-success btn-sm">
+		<i class="fa fa-plus icon-embed-btn"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
 <?php
 	include("foot.inc");
 	exit;
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php
index 51c636a..6ab7389 100644
--- a/src/usr/local/www/system_camanager.php
+++ b/src/usr/local/www/system_camanager.php
@@ -379,19 +379,22 @@ display_top_tabs($tab_array);
 
 if (!($act == "new" || $act == "edit" || $act == gettext("Save") || $input_errors)) {
 ?>
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-	<thead>
-		<tr>
-			<th><?=gettext("Name")?></th>
-			<th><?=gettext("Internal")?></th>
-			<th><?=gettext("Issuer")?></th>
-			<th><?=gettext("Certificates")?></th>
-			<th><?=gettext("Distinguished Name")?></th>
-			<th><?=gettext("Actions")?></th>
-		</tr>
-	</thead>
-	<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Certificate Authorities')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+		<table class="table table-striped table-hover">
+			<thead>
+				<tr>
+					<th><?=gettext("Name")?></th>
+					<th><?=gettext("Internal")?></th>
+					<th><?=gettext("Issuer")?></th>
+					<th><?=gettext("Certificates")?></th>
+					<th><?=gettext("Distinguished Name")?></th>
+					<th><?=gettext("Actions")?></th>
+				</tr>
+			</thead>
+			<tbody>
 <?php
 foreach ($a_ca as $i => $ca):
 	$name = htmlspecialchars($ca['descr']);
@@ -427,30 +430,32 @@ foreach ($a_ca as $i => $ca):
 		}
 	}
 ?>
-		<tr>
-			<td><?=$name?></td>
-			<td><?=$internal?></td>
-			<td><i><?=$issuer_name?></i></td>
-			<td><?=$certcount?></td>
-			<td>
-				<?=$subj?>
-				<br />
-				<small>
-					<?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b>
-				</small>
-			</td>
-			<td>
-				<a class="fa fa-pencil"	title="<?=gettext("Edit")?>"	href="system_camanager.php?act=edit&amp;id=<?=$i?>"></a>
-				<a class="fa fa-sign-in"	title="<?=gettext("Export")?>"	href="system_camanager.php?act=exp&amp;id=<?=$i?>"></a>
-			<?php if ($ca['prv']): ?>
-				<a class="fa fa-key"	title="<?=gettext("Export key")?>"	href="system_camanager.php?act=expkey&amp;id=<?=$i?>"></a>
-			<?php endif?>
-				<a class="fa fa-trash" 	title="<?=gettext("Delete")?>"	href="system_camanager.php?act=del&amp;id=<?=$i?>"></a>
-			</td>
-		</tr>
+				<tr>
+					<td><?=$name?></td>
+					<td><?=$internal?></td>
+					<td><i><?=$issuer_name?></i></td>
+					<td><?=$certcount?></td>
+					<td>
+						<?=$subj?>
+						<br />
+						<small>
+							<?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b>
+						</small>
+					</td>
+					<td>
+						<a class="fa fa-pencil"	title="<?=gettext("Edit")?>"	href="system_camanager.php?act=edit&amp;id=<?=$i?>"></a>
+						<a class="fa fa-sign-in"	title="<?=gettext("Export")?>"	href="system_camanager.php?act=exp&amp;id=<?=$i?>"></a>
+					<?php if ($ca['prv']): ?>
+						<a class="fa fa-key"	title="<?=gettext("Export key")?>"	href="system_camanager.php?act=expkey&amp;id=<?=$i?>"></a>
+					<?php endif?>
+						<a class="fa fa-trash" 	title="<?=gettext("Delete")?>"	href="system_camanager.php?act=del&amp;id=<?=$i?>"></a>
+					</td>
+				</tr>
 <?php endforeach; ?>
-	</tbody>
-</table>
+			</tbody>
+		</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index da82490..f8f8841 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -994,18 +994,21 @@ print $form;
 	print($form);
 } else {
 ?>
-<div class="table-responsive">
-<table class="table table-striped table-hover">
-	<thead>
-		<tr>
-			<th><?=gettext("Name")?></th>
-			<th><?=gettext("Issuer")?></th>
-			<th><?=gettext("Distinguished Name")?></th>
-			<th><?=gettext("In Use")?></th>
-			<th class="col-sm-2"><?=gettext("Actions")?></th>
-		</tr>
-	</thead>
-	<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Certificates')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+		<table class="table table-striped table-hover">
+			<thead>
+				<tr>
+					<th><?=gettext("Name")?></th>
+					<th><?=gettext("Issuer")?></th>
+					<th><?=gettext("Distinguished Name")?></th>
+					<th><?=gettext("In Use")?></th>
+					<th class="col-sm-2"><?=gettext("Actions")?></th>
+				</tr>
+			</thead>
+			<tbody>
 <?php
 foreach ($a_cert as $i => $cert):
 	$name = htmlspecialchars($cert['descr']);
@@ -1035,67 +1038,69 @@ foreach ($a_cert as $i => $cert):
 		$caname = $ca['descr'];
 	}
 ?>
-		<tr>
-			<td>
-				<?=$name?><br />
-				<?php if ($cert['type']): ?>
-					<i><?=$cert_types[$cert['type']]?></i><br />
-				<?php endif?>
-				<?php if (is_array($purpose)): ?>
-					CA: <b><?=$purpose['ca']?></b>, Server: <b><?=$purpose['server']?></b>
-				<?php endif?>
-			</td>
-			<td><?=$caname?></td>
-			<td>
-				<?=$subj?>
-				<?php if (!$cert['csr']): ?>
-				<br />
-				<small>
-					<?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b>
-				</small>
-				<?php endif?>
-			</td>
-			<td>
-				<?php if (is_cert_revoked($cert)): ?>
-					<i>Revoked </i>
-				<?php endif?>
-				<?php if (is_webgui_cert($cert['refid'])): ?>
-					webConfigurator
-				<?php endif?>
-				<?php if (is_user_cert($cert['refid'])): ?>
-					User Cert
-				<?php endif?>
-				<?php if (is_openvpn_server_cert($cert['refid'])): ?>
-					OpenVPN Server
-				<?php endif?>
-				<?php if (is_openvpn_client_cert($cert['refid'])): ?>
-					OpenVPN Client
-				<?php endif?>
-				<?php if (is_ipsec_cert($cert['refid'])): ?>
-					IPsec Tunnel
-				<?php endif?>
-				<?php if (is_captiveportal_cert($cert['refid'])): ?>
-					Captive Portal
-				<?php endif?>
-			</td>
-			<td>
-				<?php if (!$cert['csr']): ?>
-					<a href="system_certmanager.php?act=exp&amp;id=<?=$i?>" class="fa fa-sign-in" title="<?=gettext("Export Certificate")?>"></a>
-					<a href="system_certmanager.php?act=key&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export Key")?>"></a>
-					<a href="system_certmanager.php?act=p12&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export P12")?>"> P12</a>
-				<?php else: ?>
-					<a href="system_certmanager.php?act=csr&amp;id=<?=$i?>" class="fa fa-pencil" title="<?=gettext("Update CSR")?>"></a>
-					<a href="system_certmanager.php?act=req&amp;id=<?=$i?>" class="fa fa-sign-in" title="<?=gettext("Export Request")?>"></a>
-					<a href="system_certmanager.php?act=key&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export Key")?>"></a>
-				<?php endif?>
-				<?php if (!cert_in_use($cert['refid'])): ?>
-					<a href="system_certmanager.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext("Delete")?>"></a>
-				<?php endif?>
-			</td>
-		</tr>
+				<tr>
+					<td>
+						<?=$name?><br />
+						<?php if ($cert['type']): ?>
+							<i><?=$cert_types[$cert['type']]?></i><br />
+						<?php endif?>
+						<?php if (is_array($purpose)): ?>
+							CA: <b><?=$purpose['ca']?></b>, Server: <b><?=$purpose['server']?></b>
+						<?php endif?>
+					</td>
+					<td><?=$caname?></td>
+					<td>
+						<?=$subj?>
+						<?php if (!$cert['csr']): ?>
+						<br />
+						<small>
+							<?=gettext("Valid From")?>: <b><?=$startdate ?></b><br /><?=gettext("Valid Until")?>: <b><?=$enddate ?></b>
+						</small>
+						<?php endif?>
+					</td>
+					<td>
+						<?php if (is_cert_revoked($cert)): ?>
+							<i>Revoked </i>
+						<?php endif?>
+						<?php if (is_webgui_cert($cert['refid'])): ?>
+							webConfigurator
+						<?php endif?>
+						<?php if (is_user_cert($cert['refid'])): ?>
+							User Cert
+						<?php endif?>
+						<?php if (is_openvpn_server_cert($cert['refid'])): ?>
+							OpenVPN Server
+						<?php endif?>
+						<?php if (is_openvpn_client_cert($cert['refid'])): ?>
+							OpenVPN Client
+						<?php endif?>
+						<?php if (is_ipsec_cert($cert['refid'])): ?>
+							IPsec Tunnel
+						<?php endif?>
+						<?php if (is_captiveportal_cert($cert['refid'])): ?>
+							Captive Portal
+						<?php endif?>
+					</td>
+					<td>
+						<?php if (!$cert['csr']): ?>
+							<a href="system_certmanager.php?act=exp&amp;id=<?=$i?>" class="fa fa-sign-in" title="<?=gettext("Export Certificate")?>"></a>
+							<a href="system_certmanager.php?act=key&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export Key")?>"></a>
+							<a href="system_certmanager.php?act=p12&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export P12")?>"> P12</a>
+						<?php else: ?>
+							<a href="system_certmanager.php?act=csr&amp;id=<?=$i?>" class="fa fa-pencil" title="<?=gettext("Update CSR")?>"></a>
+							<a href="system_certmanager.php?act=req&amp;id=<?=$i?>" class="fa fa-sign-in" title="<?=gettext("Export Request")?>"></a>
+							<a href="system_certmanager.php?act=key&amp;id=<?=$i?>" class="fa fa-key" title="<?=gettext("Export Key")?>"></a>
+						<?php endif?>
+						<?php if (!cert_in_use($cert['refid'])): ?>
+							<a href="system_certmanager.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext("Delete")?>"></a>
+						<?php endif?>
+					</td>
+				</tr>
 <?php endforeach; ?>
-	</tbody>
-</table>
+			</tbody>
+		</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php
index 8240de1..f7f35f5 100644
--- a/src/usr/local/www/system_gateway_groups.php
+++ b/src/usr/local/www/system_gateway_groups.php
@@ -140,58 +140,62 @@ $tab_array[] = array(gettext("Static Routes"), false, "system_routes.php");
 $tab_array[] = array(gettext("Gateway Groups"), true, "system_gateway_groups.php");
 display_top_tabs($tab_array);
 ?>
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed">
-		<thead>
-			<tr>
-				<th><?=gettext("Group Name")?></th>
-				<th><?=gettext("Gateways")?></th>
-				<th><?=gettext("Priority")?></th>
-				<th><?=gettext("Description")?></th>
-				<th><?=gettext("Actions")?></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Gateway groups')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th><?=gettext("Group Name")?></th>
+						<th><?=gettext("Gateways")?></th>
+						<th><?=gettext("Priority")?></th>
+						<th><?=gettext("Description")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 $i = 0;
 foreach ($a_gateway_groups as $gateway_group):
 ?>
-			<tr>
-				<td>
-				   <?=$gateway_group['name']?>
-				</td>
-				<td>
+					<tr>
+						<td>
+						   <?=$gateway_group['name']?>
+						</td>
+						<td>
 <?php
 	foreach ($gateway_group['item'] as $item) {
 		$itemsplit = explode("|", $item);
 		print(htmlspecialchars(strtoupper($itemsplit[0])) . "<br />\n");
 	}
 ?>
-				</td>
-				<td>
+						</td>
+						<td>
 <?php
 	foreach ($gateway_group['item'] as $item) {
 		$itemsplit = explode("|", $item);
 		print("Tier ". htmlspecialchars($itemsplit[1]) . "<br />\n");
 	}
 ?>
-				</td>
-				<td>
-					<?=htmlspecialchars($gateway_group['descr'])?>
-				</td>
-				<td>
-					<a href="system_gateway_groups_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a>
-					<a href="system_gateway_groups_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
-					<a href="system_gateway_groups.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
-				</td>
-			</tr>
+						</td>
+						<td>
+							<?=htmlspecialchars($gateway_group['descr'])?>
+						</td>
+						<td>
+							<a href="system_gateway_groups_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a>
+							<a href="system_gateway_groups_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
+							<a href="system_gateway_groups.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
+						</td>
+					</tr>
 <?php
 	$i++;
 endforeach;
 ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php
index e73d00b..bb4c3d6 100644
--- a/src/usr/local/www/system_gateways.php
+++ b/src/usr/local/www/system_gateways.php
@@ -264,19 +264,23 @@ $tab_array[2] = array(gettext("Gateway Groups"), false, "system_gateway_groups.p
 display_top_tabs($tab_array);
 
 ?>
-<table class="table">
-<thead>
-	<tr>
-		<th></th>
-		<th><?=gettext("Name")?></th>
-		<th><?=gettext("Interface")?></th>
-		<th><?=gettext("Gateway")?></th>
-		<th><?=gettext("Monitor IP")?></th>
-		<th><?=gettext("Description")?></th>
-		<th><?=gettext("Actions")?></th>
-	</tr>
-</thead>
-<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Gateways')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped tabel-hover table-condensed">
+				<thead>
+					<tr>
+						<th></th>
+						<th><?=gettext("Name")?></th>
+						<th><?=gettext("Interface")?></th>
+						<th><?=gettext("Gateway")?></th>
+						<th><?=gettext("Monitor IP")?></th>
+						<th><?=gettext("Description")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 foreach ($a_gateways as $i => $gateway):
 	if (isset($gateway['inactive'])) {
@@ -293,49 +297,52 @@ foreach ($a_gateways as $i => $gateway):
 		$title = '';
 	}
 ?>
-	<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
-		<td title="<?=$title?>"><i class="fa <?=$icon?>"></i></td>
-		<td>
-			<?=htmlspecialchars($gateway['name'])?>
+				<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
+					<td title="<?=$title?>"><i class="fa <?=$icon?>"></i></td>
+					<td>
+						<?=htmlspecialchars($gateway['name'])?>
 <?php
 			if (isset($gateway['defaultgw'])) {
 				echo " <strong>(default)</strong>";
 			}
 ?>
-		</td>
-		<td>
-			<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gateway['friendlyiface']))?>
-		</td>
-		<td>
-			<?=htmlspecialchars($gateway['gateway'])?>
-		</td>
-		<td>
-			<?=htmlspecialchars($gateway['monitor'])?>
-		</td>
-		<td>
-			<?=htmlspecialchars($gateway['descr'])?>
-		</td>
-		<td>
-			<a href="system_gateways_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit');?>"></a>
-			<a href="system_gateways_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
+						</td>
+						<td>
+							<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gateway['friendlyiface']))?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gateway['gateway'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gateway['monitor'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($gateway['descr'])?>
+						</td>
+						<td>
+							<a href="system_gateways_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit');?>"></a>
+							<a href="system_gateways_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
 
 <?php if (is_numeric($gateway['attribute'])): ?>
 	<?php if (isset($gateway['disabled'])) {
 	?>
-			<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a>
+							<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a>
 	<?php } else {
 	?>
-			<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a>
+							<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a>
 	<?php }
 	?>
-			<a href="system_gateways.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
+							<a href="system_gateways.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
 
 <?php endif; ?>
-		</td>
-	</tr>
+						</td>
+					</tr>
 <?php endforeach; ?>
-</tbody>
-</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
 
 <nav class="action-buttons">
 	<a href="system_gateways_edit.php" role="button" class="btn btn-success">
diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php
index b903dc7..07df162 100644
--- a/src/usr/local/www/system_groupmanager.php
+++ b/src/usr/local/www/system_groupmanager.php
@@ -277,17 +277,20 @@ display_top_tabs($tab_array);
 
 if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) {
 ?>
-	<div class="table-responsive">
-		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
-			<thead>
-				<tr>
-					<th><?=gettext("Group name")?></th>
-					<th><?=gettext("Description")?></th>
-					<th><?=gettext("Member Count")?></th>
-					<th><?=gettext("Actions")?></th>
-				</tr>
-			</thead>
-			<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Groups')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
+				<thead>
+					<tr>
+						<th><?=gettext("Group name")?></th>
+						<th><?=gettext("Description")?></th>
+						<th><?=gettext("Member Count")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 	foreach ($a_group as $i => $group):
 		if ($group["name"] == "all") {
@@ -296,36 +299,38 @@ if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) {
 			$groupcount = count($group['member']);
 		}
 ?>
-				<tr>
-					<td>
-						<?=htmlspecialchars($group['name'])?>
-					</td>
-					<td>
-						<?=htmlspecialchars($group['description'])?>
-					</td>
-					<td>
-						<?=$groupcount?>
-					</td>
-					<td>
-						<a class="fa fa-pencil" title="<?=gettext("Edit group"); ?>" href="?act=edit&amp;groupid=<?=$i?>"></a>
-						<?php if ($group['scope'] != "system"): ?>
-							<a class="fa fa-trash"	title="<?=gettext("Delete group")?>" href="?act=delgroup&amp;groupid=<?=$i?>&amp;groupname=<?=$group['name']?>"></a>
-						<?php endif;?>
-					</td>
-				</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars($group['name'])?>
+						</td>
+						<td>
+							<?=htmlspecialchars($group['description'])?>
+						</td>
+						<td>
+							<?=$groupcount?>
+						</td>
+						<td>
+							<a class="fa fa-pencil" title="<?=gettext("Edit group"); ?>" href="?act=edit&amp;groupid=<?=$i?>"></a>
+							<?php if ($group['scope'] != "system"): ?>
+								<a class="fa fa-trash"	title="<?=gettext("Delete group")?>" href="?act=delgroup&amp;groupid=<?=$i?>&amp;groupname=<?=$group['name']?>"></a>
+							<?php endif;?>
+						</td>
+					</tr>
 <?php
 	endforeach;
 ?>
-			</tbody>
-		</table>
+				</tbody>
+			</table>
+		</div>
 	</div>
-
-	<nav class="action-buttons">
-		<a href="?act=new" class="btn btn-success btn-sm">
-			<i class="fa fa-plus icon-embed-btn"></i>
-			<?=gettext("Add")?>
-		</a>
-	</nav>
+</div>
+
+<nav class="action-buttons">
+	<a href="?act=new" class="btn btn-success btn-sm">
+		<i class="fa fa-plus icon-embed-btn"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
 <?php
 	include('foot.inc');
 	exit;
diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php
index 3787f06..fc7667f 100644
--- a/src/usr/local/www/system_routes.php
+++ b/src/usr/local/www/system_routes.php
@@ -264,18 +264,22 @@ $tab_array[2] = array(gettext("Gateway Groups"), false, "system_gateway_groups.p
 display_top_tabs($tab_array);
 
 ?>
-<table class="table">
-<thead>
-	<tr>
-		<th></th>
-		<th><?=gettext("Network")?></th>
-		<th><?=gettext("Gateway")?></th>
-		<th><?=gettext("Interface")?></th>
-		<th><?=gettext("Description")?></th>
-		<th><?=gettext("Actions")?></th>
-	</tr>
-</thead>
-<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Static routes')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed">
+				<thead>
+					<tr>
+						<th></th>
+						<th><?=gettext("Network")?></th>
+						<th><?=gettext("Gateway")?></th>
+						<th><?=gettext("Interface")?></th>
+						<th><?=gettext("Description")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 foreach ($a_routes as $i => $route):
 	if (isset($route['disabled'])) {
@@ -284,39 +288,42 @@ foreach ($a_routes as $i => $route):
 		$icon = 'fa-check-circle-o';
 	}
 ?>
-	<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
-		<td><i class="fa <?=$icon?>"></i></td>
-		<td>
-			<?=strtolower($route['network'])?>
-		</td>
-		<td>
-			<?=htmlentities($a_gateways[$route['gateway']]['name']) . " - " . htmlentities($a_gateways[$route['gateway']]['gateway'])?>
-		</td>
-		<td>
-			<?=convert_friendly_interface_to_friendly_descr($a_gateways[$route['gateway']]['friendlyiface'])?>
-		</td>
-		<td>
-			<?=htmlspecialchars($route['descr'])?>
-		</td>
-		<td>
-			<a href="system_routes_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a>
-
-			<a href="system_routes_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
-
-	<?php if (isset($route['disabled'])) {
-	?>
-			<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a>
-	<?php } else {
-	?>
-			<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a>
-	<?php }
-	?>
-			<a href="system_routes.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
-
-		</td>
-	</tr>
+				<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
+					<td><i class="fa <?=$icon?>"></i></td>
+					<td>
+						<?=strtolower($route['network'])?>
+					</td>
+					<td>
+						<?=htmlentities($a_gateways[$route['gateway']]['name']) . " - " . htmlentities($a_gateways[$route['gateway']]['gateway'])?>
+					</td>
+					<td>
+						<?=convert_friendly_interface_to_friendly_descr($a_gateways[$route['gateway']]['friendlyiface'])?>
+					</td>
+					<td>
+						<?=htmlspecialchars($route['descr'])?>
+					</td>
+					<td>
+						<a href="system_routes_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a>
+
+						<a href="system_routes_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a>
+
+				<?php if (isset($route['disabled'])) {
+				?>
+						<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a>
+				<?php } else {
+				?>
+						<a href="?act=toggle&amp;id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a>
+				<?php }
+				?>
+						<a href="system_routes.php?act=del&amp;id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>"></a>
+
+					</td>
+				</tr>
 <?php endforeach; ?>
-</table>
+			</table>
+		</div>
+	</div>
+</div>
 
 <nav class="action-buttons">
 	<a href="system_routes_edit.php" role="button" class="btn btn-success btn-sm">
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 33c0658..f2f6860 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -484,27 +484,30 @@ display_top_tabs($tab_array);
 if (!($act == "new" || $act == "edit" || $input_errors)) {
 ?>
 <form method="post">
-<div class="table-responsive">
-	<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
-		<thead>
-			<tr>
-				<th>&nbsp;</th>
-				<th><?=gettext("Username")?></th>
-				<th><?=gettext("Full name")?></th>
-				<th><?=gettext("Disabled")?></th>
-				<th><?=gettext("Groups")?></th>
-				<th>&nbsp;</th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Users')?></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
+				<thead>
+					<tr>
+						<th>&nbsp;</th>
+						<th><?=gettext("Username")?></th>
+						<th><?=gettext("Full name")?></th>
+						<th><?=gettext("Disabled")?></th>
+						<th><?=gettext("Groups")?></th>
+						<th>&nbsp;</th>
+					</tr>
+				</thead>
+				<tbody>
 <?php
 foreach ($a_user as $i => $userent):
 	?>
-			<tr>
-				<td>
-					<input type="checkbox" id="frc<?=$i?>" name="delete_check[]" value="<?=$i?>" <?=($userent['scope'] == "system" ? 'disabled' : '')?>/>
-				</td>
-				<td>
+					<tr>
+						<td>
+							<input type="checkbox" id="frc<?=$i?>" name="delete_check[]" value="<?=$i?>" <?=($userent['scope'] == "system" ? 'disabled' : '')?>/>
+						</td>
+						<td>
 <?php
 	if ($userent['scope'] != "user") {
 		$usrimg = 'eye-open';
@@ -512,22 +515,24 @@ foreach ($a_user as $i => $userent):
 		$usrimg = 'user';
 	}
 ?>
-					<i class="fa fa-<?=$usrimg?>"></i>
-					<?=htmlspecialchars($userent['name'])?>
-				</td>
-				<td><?=htmlspecialchars($userent['descr'])?></td>
-				<td><?php if (isset($userent['disabled'])) echo "*"?></td>
-				<td><?=implode(",", local_user_get_groups($userent))?></td>
-				<td>
-					<a class="fa fa-pencil" title="<?=gettext("Edit user"); ?>" href="?act=edit&amp;userid=<?=$i?>"></a>
+							<i class="fa fa-<?=$usrimg?>"></i>
+							<?=htmlspecialchars($userent['name'])?>
+						</td>
+						<td><?=htmlspecialchars($userent['descr'])?></td>
+						<td><?php if (isset($userent['disabled'])) echo "*"?></td>
+						<td><?=implode(",", local_user_get_groups($userent))?></td>
+						<td>
+							<a class="fa fa-pencil" title="<?=gettext("Edit user"); ?>" href="?act=edit&amp;userid=<?=$i?>"></a>
 <?php if ($userent['scope'] != "system"): ?>
-					<a class="fa fa-trash"	title="<?=gettext("Delete user")?>" href="?act=deluser&amp;userid=<?=$i?>&amp;username=<?=$userent['name']?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext("Delete user")?>" href="?act=deluser&amp;userid=<?=$i?>&amp;username=<?=$userent['name']?>"></a>
 <?php endif; ?>
-				</td>
-			</tr>
+						</td>
+					</tr>
 <?php endforeach; ?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 <nav class="action-buttons">
 	<a href="?act=new" class="btn btn-sm btn-success">
diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php
index c3886bb..1aee3a6 100644
--- a/src/usr/local/www/vpn_ipsec_keys.php
+++ b/src/usr/local/www/vpn_ipsec_keys.php
@@ -131,75 +131,72 @@ if (is_subsystem_dirty('ipsec')) {
 <div class="panel panel-default">
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Pre-Shared Keys')?></h2></div>
 	<div class="panel-body">
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover">
-		<thead>
-			<tr>
-				<th><?=gettext("Identifier"); ?></th>
-				<th><?=gettext("Type"); ?></th>
-				<th><?=gettext("Pre-Shared Key"); ?></th>
-				<th></th>
-			</tr>
-		</thead>
-
-		<tbody>
+		<div class="table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>
+						<th><?=gettext("Identifier"); ?></th>
+						<th><?=gettext("Type"); ?></th>
+						<th><?=gettext("Pre-Shared Key"); ?></th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php $i = 0; foreach ($userkeys as $secretent): ?>
-			<tr>
-				<td>
-					<?php
-					if ($secretent['ident'] == 'allusers') {
-						echo gettext("ANY USER");
-					} else {
-						echo htmlspecialchars($secretent['ident']);
-					}
-					?>
-				</td>
-				<td>
-					<?php
-					if (empty($secretent['type'])) {
-						echo 'PSK';
-					} else {
-						echo htmlspecialchars($secretent['type']);
-					}
-					?>
-				</td>
-				<td>
-					<?=htmlspecialchars($secretent['pre-shared-key'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="system_usermanager.php?act=edit&amp;userid=<?=$secretent['id']?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?php
+							if ($secretent['ident'] == 'allusers') {
+								echo gettext("ANY USER");
+							} else {
+								echo htmlspecialchars($secretent['ident']);
+							}
+							?>
+						</td>
+						<td>
+							<?php
+							if (empty($secretent['type'])) {
+								echo 'PSK';
+							} else {
+								echo htmlspecialchars($secretent['type']);
+							}
+							?>
+						</td>
+						<td>
+							<?=htmlspecialchars($secretent['pre-shared-key'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="system_usermanager.php?act=edit&amp;userid=<?=$secretent['id']?>"></a>
+						</td>
+					</tr>
 <?php $i++; endforeach; ?>
 
 <?php $i = 0; foreach ($a_secret as $secretent): ?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($secretent['ident'])?>
-				</td>
-				<td>
-					<?php
-					if (empty($secretent['type'])) {
-						echo 'PSK';
-					} else {
-						echo htmlspecialchars($secretent['type']);
-					}
-					?>
-				</td>
-				<td>
-					<?=htmlspecialchars($secretent['pre-shared-key'])?>
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit key')?>" href="vpn_ipsec_keys_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete key')?>" href="vpn_ipsec_keys.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars($secretent['ident'])?>
+						</td>
+						<td>
+							<?php
+							if (empty($secretent['type'])) {
+								echo 'PSK';
+							} else {
+								echo htmlspecialchars($secretent['type']);
+							}
+							?>
+						</td>
+						<td>
+							<?=htmlspecialchars($secretent['pre-shared-key'])?>
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit key')?>" href="vpn_ipsec_keys_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete key')?>" href="vpn_ipsec_keys.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php $i++; endforeach; ?>
-		</tbody>
-	</table>
-</div>
-
+				</tbody>
+			</table>
+		</div>
 	</div>
 </div>
 
diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php
index 9364f65..dae7a72 100644
--- a/src/usr/local/www/vpn_l2tp_users.php
+++ b/src/usr/local/www/vpn_l2tp_users.php
@@ -119,35 +119,39 @@ $tab_array[] = array(gettext("Configuration"), false, "vpn_l2tp.php");
 $tab_array[] = array(gettext("Users"), true, "vpn_l2tp_users.php");
 display_top_tabs($tab_array);
 ?>
-<div class="table-responsive">
-	<table class="table table-striped table-hover">
-		<thead>
-			<tr>
-				<th><?=gettext("Username")?></th>
-				<th><?=gettext("IP address")?></th>
-				<th><?=gettext("Actions")?></th>
-			</tr>
-		</thead>
-		<tbody>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('L2TP Users')?>></h2></div>
+	<div class="panel-body">
+		<div class="table-responsive">
+			<table class="table table-striped table-hover">
+				<thead>
+					<tr>
+						<th><?=gettext("Username")?></th>
+						<th><?=gettext("IP address")?></th>
+						<th><?=gettext("Actions")?></th>
+					</tr>
+				</thead>
+				<tbody>
 <?php $i = 0; foreach ($a_secret as $secretent):?>
-			<tr>
-				<td>
-					<?=htmlspecialchars($secretent['name'])?>
-				</td>
-				<td>
-					<?php if ($secretent['ip'] == "") $secretent['ip'] = "Dynamic"?>
-					<?=htmlspecialchars($secretent['ip'])?>&nbsp;
-				</td>
-				<td>
-					<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="vpn_l2tp_users_edit.php?id=<?=$i?>"></a>
-					<a class="fa fa-trash"	title="<?=gettext('Delete user')?>"	href="vpn_l2tp_users.php?act=del&amp;id=<?=$i?>"></a>
-				</td>
-			</tr>
+					<tr>
+						<td>
+							<?=htmlspecialchars($secretent['name'])?>
+						</td>
+						<td>
+							<?php if ($secretent['ip'] == "") $secretent['ip'] = "Dynamic"?>
+							<?=htmlspecialchars($secretent['ip'])?>&nbsp;
+						</td>
+						<td>
+							<a class="fa fa-pencil"	title="<?=gettext('Edit user')?>"	href="vpn_l2tp_users_edit.php?id=<?=$i?>"></a>
+							<a class="fa fa-trash"	title="<?=gettext('Delete user')?>"	href="vpn_l2tp_users.php?act=del&amp;id=<?=$i?>"></a>
+						</td>
+					</tr>
 <?php $i++; endforeach?>
-		</tbody>
-	</table>
+				</tbody>
+			</table>
+		</div>
+	</div>
 </div>
-
 <nav class="action-buttons">
 	<a class="btn btn-success btn-sm" href="vpn_l2tp_users_edit.php">
 		<i class="fa fa-plus icon-embed-btn"></i>
-- 
cgit v1.1