9 files changed, 61 insertions, 4 deletions
diff --git a/src/usr/local/www/diag_arp.php b/src/usr/local/www/diag_arp.php
index d456be9..8ec4623 100644
--- a/src/usr/local/www/diag_arp.php
+++ b/src/usr/local/www/diag_arp.php
@@ -333,6 +333,10 @@ $data = msort($data, "dnsresolve");
 // Load MAC-Manufacturer table
 $mac_man = load_mac_manufacturer_table();
 ?>
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('ARP Table')?></h2></div>
+	<div class="panel-body">
+
 <div class="table-responsive">
 	<table class="sortable-theme-bootstrap table table-striped table-hover" data-sortable>
 		<thead>
@@ -368,6 +372,9 @@ $mac_man = load_mac_manufacturer_table();
 	</table>
 </div>
 
+	</div>
+</div>
+
 <script type="text/javascript">
 //<![CDATA[
 // Clear the "loading" div once the page has loaded"
diff --git a/src/usr/local/www/diag_ndp.php b/src/usr/local/www/diag_ndp.php
index b542552..348002d 100644
--- a/src/usr/local/www/diag_ndp.php
+++ b/src/usr/local/www/diag_ndp.php
@@ -129,6 +129,10 @@ $pgtitle = array(gettext("Diagnostics"), gettext("NDP Table"));
 include("head.inc");
 ?>
 
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('NDP Table')?></h2></div>
+	<div class="panel-body">
+
 <div class="table-responsive">
 	<table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable>
 		<thead>
@@ -173,4 +177,7 @@ include("head.inc");
 	</table>
 </div>
 
+	</div>
+</div>
+
 <?php include("foot.inc");
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 2733a7a..9862ebb 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -212,7 +212,7 @@ display_top_tabs($tab_array);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">Firewall Aliases <?=$bctab?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Firewall Aliases') . " " . $bctab?></h2></div>
 	<div class="panel-body">
 
 <div class="table-responsive">
@@ -294,8 +294,8 @@ display_top_tabs($tab_array);
 </table>
 </div>
 
-	</div><!-- panel body -->
-</div><!-- panel default -->
+	</div>
+</div>
 
 <nav class="action-buttons">
 	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" class="btn btn-success btn-sm">
diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php
index 7face46..4e531ce 100644
--- a/src/usr/local/www/services_igmpproxy.php
+++ b/src/usr/local/www/services_igmpproxy.php
@@ -111,6 +111,11 @@ 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>
@@ -161,6 +166,10 @@ endforeach;
 			</tbody>
 		</table>
 	</div>
+
+	</div>
+</div>
+	
 </form>
 
 <nav class="action-buttons">
diff --git a/src/usr/local/www/services_pppoe.php b/src/usr/local/www/services_pppoe.php
index 109520b..fc40515 100644
--- a/src/usr/local/www/services_pppoe.php
+++ b/src/usr/local/www/services_pppoe.php
@@ -126,7 +126,11 @@ if (is_subsystem_dirty('vpnpppoe')) {
 }
 ?>
 
-<div class="table-responsive">
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('PPPoE Server')?></h2></div>
+	<div class="panel-body">
+	
+	<div class="table-responsive">
 	<table class="table table-striped table-hover table-condensed">
 		<thead>
 			<tr>
@@ -168,6 +172,9 @@ endforeach;
 	</table>
 </div>
 
+	</div>
+</div>
+
 <nav class="action-buttons">
 	<a href="services_pppoe_edit.php" class="btn btn-success">
 		<i class="fa fa-plus icon-embed-btn"></i>
diff --git a/src/usr/local/www/status_gateway_groups.php b/src/usr/local/www/status_gateway_groups.php
index b88c7cd..d244b88 100755
--- a/src/usr/local/www/status_gateway_groups.php
+++ b/src/usr/local/www/status_gateway_groups.php
@@ -92,6 +92,9 @@ $tab_array[0] = array(gettext("Gateways"), false, "status_gateways.php");
 $tab_array[1] = array(gettext("Gateway Groups"), true, "status_gateway_groups.php");
 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">
@@ -204,4 +207,7 @@ display_top_tabs($tab_array);
 	</table>
 </div>
 
+	</div>
+</div>
+
 <?php include("foot.inc");
diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php
index 97c0051..f6ad489 100644
--- a/src/usr/local/www/status_gateways.php
+++ b/src/usr/local/www/status_gateways.php
@@ -87,6 +87,9 @@ $tab_array[] = array(gettext("Gateways"), true, "status_gateways.php");
 $tab_array[] = array(gettext("Gateway Groups"), false, "status_gateway_groups.php");
 display_top_tabs($tab_array);
 ?>
+<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 table-hover table-condensed sortable-theme-bootstrap" data-sortable>
@@ -188,4 +191,7 @@ display_top_tabs($tab_array);
 	</table>
 </div>
 
+	</div>
+</div>
+
 <?php include("foot.inc"); ?>
diff --git a/src/usr/local/www/status_services.php b/src/usr/local/www/status_services.php
index a944696..905057a 100755
--- a/src/usr/local/www/status_services.php
+++ b/src/usr/local/www/status_services.php
@@ -118,6 +118,10 @@ if (count($services) > 0) {
 	<input id="id" type="hidden" name="id" value=""/>
 	<input id="zone" type="hidden" name="zone" value=""/>
 
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Services')?></h2></div>
+	<div class="panel-body">
+
 	<div class="panel-body panel-default">
 		<div class="table-responsive">
 			<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
@@ -184,6 +188,10 @@ if (count($services) > 0) {
 			</table>
 		</div>
 	</div>
+
+	</div>
+</div>
+
 </form>
 <?php
 } else {
diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php
index 7fcd642..c3886bb 100644
--- a/src/usr/local/www/vpn_ipsec_keys.php
+++ b/src/usr/local/www/vpn_ipsec_keys.php
@@ -128,6 +128,10 @@ if (is_subsystem_dirty('ipsec')) {
 	display_top_tabs($tab_array);
 ?>
 
+<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>
@@ -196,6 +200,9 @@ if (is_subsystem_dirty('ipsec')) {
 	</table>
 </div>
 
+	</div>
+</div>
+
 <nav class="action-buttons">
 	<a class="btn btn-success btn-sm" href="vpn_ipsec_keys_edit.php">
 		<i class="fa fa-plus icon-embed-btn"></i>