diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php
index e1c7084c1f..e5890dd82a 100644
--- a/app/access_controls/access_control_edit.php
+++ b/app/access_controls/access_control_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018 - 2022
+	Portions created by the Initial Developer are Copyright (C) 2018-2024
 	the Initial Developer. All Rights Reserved.
 */
 
@@ -359,6 +359,7 @@
 		}
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -473,6 +474,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/access_controls/access_control_import.php b/app/access_controls/access_control_import.php
index d8e5c9b465..72a0619c71 100644
--- a/app/access_controls/access_control_import.php
+++ b/app/access_controls/access_control_import.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2023
+	Portions created by the Initial Developer are Copyright (C) 2008-2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -162,6 +162,8 @@
 			echo "</div>\n";
 
 			echo $text['description-import']."\n";
+
+			echo "<div class='card'>\n";
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 			//loop through the lines and fields
@@ -195,6 +197,7 @@
 			}
 
 			echo "</table>\n";
+			echo "</div>\n";
 			echo "<br /><br />\n";
 
 			echo "<input name='action' type='hidden' value='import'>\n";
@@ -370,6 +373,7 @@
 	echo $text['description-import']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
 
 	echo "<tr>\n";
@@ -440,6 +444,7 @@
 	echo "</tr>\n";
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br /><br />\n";
 
 	echo "<input name='type' type='hidden' value='csv'>\n";
diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index 81104c2f4b..5415dd9f40 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2018 - 2023
+	Portions created by the Initial Developer are Copyright (C) 2018-2024
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -192,6 +192,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('access_control_add') || permission_exists('access_control_edit') || permission_exists('access_control_delete')) {
@@ -242,6 +243,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/database_transactions/database_transaction_edit.php b/app/database_transactions/database_transaction_edit.php
index d0423f398b..e494b606ae 100644
--- a/app/database_transactions/database_transaction_edit.php
+++ b/app/database_transactions/database_transaction_edit.php
@@ -138,7 +138,8 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<table width='400'  border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<div class='card'>\n";
+	echo "<table width='400' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<td valign='top'>\n";
 	echo "	<table>\n";
@@ -205,8 +206,10 @@
 
 	echo "</tr>\n";
 	echo "</table>\n";
+	echo "</div>\n";
 
 	if (!empty($_REQUEST["debug"]) && $_REQUEST["debug"] == "true") {
+		echo "<div class='card'>\n";
 		echo "<table width='50%'  border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr>\n";
 		echo "<th valign='top' align='left' nowrap='nowrap'>\n";
@@ -235,6 +238,7 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 		echo "</table>";
+		echo "</div>";
 	}
 
 //define the array _difference function
@@ -359,9 +363,10 @@
 				}
 			}
 		}
-		echo "<br />\n";
-		echo "<table width='100%'>\n";
 		if (!empty($array)) {
+			echo "<br />\n";
+			echo "<div class='card'>\n";
+			echo "<table width='100%'>\n";
 			$previous_schema = null;
 			foreach ($array as $row) {
 				if ($row['schema'] !== $previous_schema || $row['row'] !== $previous_row) {
@@ -380,6 +385,7 @@
 				$previous_row = $row['row'];
 			}
 			echo "</table>\n";
+			echo "</div>\n";
 		}
 		/*
 		if (!empty($after)) {
@@ -417,15 +423,18 @@
 
 			//show the difference
 				echo "<br />\n";
+				echo "<div class='card'>\n";
 				echo "<table width='100%'>\n";
 				show_difference($array);
 				echo "</table>\n";
+				echo "</div>\n";
 		}
 	}
 
 //show the delete
 	if ($transaction_type == "delete") {
 		echo "<br /><br />\n";
+		echo "<div class='card'>\n";
 		echo "<table width='100%'>\n";
 		if (!empty($before)) {
 			foreach ($before as $table_name => $rows) {
@@ -444,8 +453,9 @@
 				}
 			}
 		}
+		echo "</table>\n";
+		echo "</div>\n";
 	}
-	echo "</table>\n";
 
 //add a few lines at the end
 	echo "<br /><br />\n";
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index 2a84b7dda4..aff1863eb7 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -177,6 +177,7 @@
 	echo $text['description-database_transactions']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
@@ -216,6 +217,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 
diff --git a/app/email_templates/email_template_edit.php b/app/email_templates/email_template_edit.php
index 56ac6c889d..7ae656f14c 100644
--- a/app/email_templates/email_template_edit.php
+++ b/app/email_templates/email_template_edit.php
@@ -252,6 +252,7 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -453,6 +454,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	if ($action == "update") {
diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php
index 2b4ba6077e..25f3fab482 100644
--- a/app/email_templates/email_templates.php
+++ b/app/email_templates/email_templates.php
@@ -230,6 +230,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) {
@@ -310,6 +311,7 @@
 	unset($result);
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 
diff --git a/app/modules/modules.php b/app/modules/modules.php
index 1dee38b378..3faaa322fe 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -162,6 +162,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	function write_header($modifier) {
 		global $text, $modules, $list_row_edit_button;
@@ -271,6 +272,7 @@
 	unset($modules);
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/number_translations/number_translation_edit.php b/app/number_translations/number_translation_edit.php
index 53e0c29a51..5aca472f22 100644
--- a/app/number_translations/number_translation_edit.php
+++ b/app/number_translations/number_translation_edit.php
@@ -253,6 +253,7 @@
 		}
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -365,6 +366,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index ebab021f2b..802b38e21e 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -206,6 +206,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('number_translation_add') || permission_exists('number_translation_edit') || permission_exists('number_translation_delete')) {
@@ -265,6 +266,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 499fcad74d..7f59589ae3 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -448,6 +448,7 @@
 		}
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -659,6 +660,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	if ($action == "update") {
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 0997d2c479..b9bf335af6 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -168,6 +168,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit') || permission_exists('sip_profile_delete')) {
@@ -228,6 +229,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/sofia_global_settings/sofia_global_setting_edit.php b/app/sofia_global_settings/sofia_global_setting_edit.php
index a2bba6a24b..3918fa0a6e 100644
--- a/app/sofia_global_settings/sofia_global_setting_edit.php
+++ b/app/sofia_global_settings/sofia_global_setting_edit.php
@@ -221,6 +221,7 @@
 		}
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -279,6 +280,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/sofia_global_settings/sofia_global_settings.php b/app/sofia_global_settings/sofia_global_settings.php
index 656ad35145..bab37746aa 100644
--- a/app/sofia_global_settings/sofia_global_settings.php
+++ b/app/sofia_global_settings/sofia_global_settings.php
@@ -189,6 +189,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('sofia_global_setting_add') || permission_exists('sofia_global_setting_edit') || permission_exists('sofia_global_setting_delete')) {
@@ -250,6 +251,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index b41b25c42b..48d807856d 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -206,6 +206,7 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -338,10 +339,13 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "</table>\n";
+	echo "</div>\n";
+
+
 	//if variable is a code then show the codec info
 	if ($var_name == "global_codec_prefs" || $var_name == "outbound_codec_prefs") {
-		echo "<tr>\n";
-		echo "<td align='left' colspan='2'>\n";
+		echo "<div class='card'>\n";
 		echo "<br />\n";
 		echo "<b>".$text['label-codec_information']."</b><br><br>\n";
 		echo "Module must be compiled and loaded. &nbsp; &nbsp; codecname[@8000h|16000h|32000h[@XXi]]<br />\n";
@@ -407,11 +411,8 @@
 		echo "	</td>\n";
 		echo "	</tr>\n";
 		echo "	</table>\n";
-		echo "</td>";
-		echo "</tr>";
+		echo "</div>\n";
 	}
-
-	echo "</table>";
 	echo "<br><br>";
 
 	if ($action == "update") {
diff --git a/app/vars/vars.php b/app/vars/vars.php
index cc9dfac1a1..c404618960 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -186,6 +186,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	function write_header($modifier) {
 		global $text, $order_by, $order, $vars, $list_row_edit_button;
@@ -272,6 +273,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index 6f24586612..d72cb143fc 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -251,6 +251,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 	}
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -405,6 +406,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br><br>";
 
 	if ($action == "update") {
diff --git a/core/databases/databases.php b/core/databases/databases.php
index a0cbe2212a..7c2b826e79 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -137,6 +137,7 @@
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('database_add') || permission_exists('database_delete')) {
@@ -189,6 +190,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 1cc3ab8aaa..e2839fed06 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -297,6 +297,7 @@
 	}
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -814,6 +815,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br><br>";
 
 	if ($action == "update") {
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index ac3ab2b0d0..eaabffb6d3 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -432,12 +432,13 @@
 			if ($previous_default_setting_category != $row['default_setting_category']) {
 				if (!empty($previous_default_setting_category)) {
 					echo "</table>\n";
-					echo "<br />\n";
+					echo "</div>\n";
 					echo "</div>\n";
 				}
 				echo "<div class='category' id='category_".$default_setting_category."'>\n";
 				echo "<b>".escape($label_default_setting_category)."</b><br>\n";
 
+				echo "<div class='card'>\n";
 				echo "<table class='list'>\n";
 				echo "<tr class='list-header'>\n";
 				if ($permission['default_setting_add'] || $permission['default_setting_edit'] || $permission['default_setting_delete']) {
@@ -613,6 +614,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "</div>\n";
 
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 237f058464..98f776ad8b 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -390,6 +390,7 @@
 	}
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -850,6 +851,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	echo "<input type='hidden' name='domain_uuid' value='".escape($domain_uuid)."'>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 4e84fbdb42..0f3df5c5ec 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -214,6 +214,7 @@
 	echo "<input type='hidden' name='domain_uuid' value='".escape($domain_uuid)."'>\n";
 	echo "<input type='hidden' name='domain_uuid_target' id='domain_uuid_target' value=''>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	if (!empty($domain_settings)) {
 		//define the variable
@@ -403,6 +404,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php
index 9dd4649425..bc40710efb 100644
--- a/core/domains/domain_edit.php
+++ b/core/domains/domain_edit.php
@@ -659,6 +659,7 @@
 	}
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 
 	echo "<tr>\n";
@@ -706,6 +707,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	if ($action == "update") {
diff --git a/core/domains/domains.php b/core/domains/domains.php
index b065fd7ec5..d05d07d959 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -223,6 +223,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
@@ -297,6 +298,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/groups/group_edit.php b/core/groups/group_edit.php
index 7b8d7072ae..ce826c5088 100644
--- a/core/groups/group_edit.php
+++ b/core/groups/group_edit.php
@@ -237,6 +237,7 @@
 	echo $text['description-groups']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -320,6 +321,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br /><br />";
 
 	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
diff --git a/core/groups/group_members.php b/core/groups/group_members.php
index 6ae2aab5f8..4d4c82a846 100644
--- a/core/groups/group_members.php
+++ b/core/groups/group_members.php
@@ -181,6 +181,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('group_member_delete')) {
@@ -214,6 +215,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>";
 	echo "</form>";
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index 47c7d00485..efd6ecf0a9 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -308,7 +308,9 @@
 	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
 	echo "<input type='hidden' name='view' value=\"".escape($view)."\">\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
-	echo "<table class='list' style='margin-bottom: 25px;'>\n";
+
+	echo "<div class='card'>\n";
+	echo "<table class='list'>\n";
 	if (is_array($group_permissions) && @sizeof($group_permissions) != 0) {
 		$x = 0;
 		foreach ($group_permissions as $row) {
@@ -388,6 +390,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "</form>\n";
 
 //include the footer
diff --git a/core/groups/groups.php b/core/groups/groups.php
index 46f951f5b7..ec685d82f8 100644
--- a/core/groups/groups.php
+++ b/core/groups/groups.php
@@ -188,6 +188,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('group_add') || permission_exists('group_edit') || permission_exists('group_delete')) {
@@ -257,6 +258,7 @@ echo "	<td>".escape($row['domain_name'])."</td>\n";
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/menu/menu.php b/core/menu/menu.php
index 55bf3d89bd..4847c35368 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -143,6 +143,7 @@
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
@@ -193,6 +194,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".!empty($paging_controls)."</div>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index e93e4d4627..2a24bc44fd 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -178,6 +178,7 @@
 	echo $text['description-menu']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -214,7 +215,8 @@
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "<br><br>";
+	echo "</div>";
+	echo "<br>";
 
 	if ($action == "update") {
 		echo "<input type='hidden' name='menu_uuid' value='".escape($menu_uuid)."'>\n";
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index cd5b007e03..dba0d09a89 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -396,6 +396,7 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 
 	echo "	<tr>";
@@ -563,6 +564,7 @@
 	echo "	</tr>";
 
 	echo "</table>";
+	echo "</div>";
 	echo "<br><br>";
 
 	if (permission_exists('menu_add') || permission_exists('menu_edit')) {
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index 367231119a..93eb987a93 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -259,6 +259,7 @@
 		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "	<tr class='list-header'>";
 	if (permission_exists('menu_item_edit') || permission_exists('menu_item_delete')) {
@@ -402,6 +403,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index ac036c3301..8c74e89acd 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -277,6 +277,7 @@
 	echo $text['description-upgrade'];
 	echo "<br /><br />";
 
+	echo "<div class='card'>\n";
 	if (permission_exists("upgrade_source") && !is_dir("/usr/share/examples/fusionpbx") && is_writeable($_SERVER["PROJECT_ROOT"]."/.git")) {
 		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 		echo "<tr onclick=\"$('#tr_applications').slideToggle('fast');\">\n";
@@ -440,12 +441,14 @@
 		echo "</table>\n";
 		$step++;
 	}
+	echo "</div>\n";
 
 	echo "</form>\n";
 
-	echo "<br /><br />";
+	echo "<br />";
 	if (!empty($_SESSION["response"]) && is_array($_SESSION["response"])) {
 		foreach($_SESSION["response"] as $part => $response){
+			echo "<div class='card'>\n";
 			echo "<b>".$text["label-results"]." - ".$text["label-{$part}"];
 			echo "</b><br /><br />";
 			$error_found = false;
@@ -484,7 +487,7 @@
 			else {
 				echo $response;
 			}
-			echo "<br /><br />";
+			echo "</div>\n";
 		}
 		unset($_SESSION["response"]);
 	}