diff --git a/app/destinations/destination_download.php b/app/destinations/destination_download.php
index 0032ae459c..ba8d097bb8 100644
--- a/app/destinations/destination_download.php
+++ b/app/destinations/destination_download.php
@@ -148,7 +148,6 @@
 
 //show the content
 	echo "<form method='post' name='frm' id='frm'>\n";
-
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-destination_export']."</b></div>\n";
 	echo "	<div class='actions'>\n";
@@ -157,10 +156,11 @@
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
-	
+
 	echo $text['description-destination_export'];
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	echo "	<th class='checkbox'>\n";
@@ -184,6 +184,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/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 13e27ef9dd..deb8175233 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -71,27 +71,27 @@
 		$condition_field_2 = $_POST["condition_field_2"] ?? null;
 		$condition_expression_2 = $_POST["condition_expression_2"] ?? null;
 		$destination_uuid = $_POST["destination_uuid"];
-	
+
 	 	$action_1 = $_POST["action_1"];
 		//$action_1 = "transfer:1001 XML default";
 		$action_1_array = explode(":", $action_1);
 		$action_application_1 = array_shift($action_1_array);
 		$action_data_1 = join(':', $action_1_array);
-	
+
 	 	$action_2 = $_POST["action_2"] ?? '';
 		//$action_2 = "transfer:1001 XML default";
 		$action_2_array = explode(":", $action_2);
 		$action_application_2 = array_shift($action_2_array);
 		$action_data_2 = join(':', $action_2_array);
-	
+
 		//$action_application_1 = $_POST["action_application_1"];
 		//$action_data_1 = $_POST["action_data_1"];
 		//$action_application_2 = $_POST["action_application_2"];
 		//$action_data_2 = $_POST["action_data_2"];
-	
+
 		$destination_carrier = '';
 		$destination_accountcode = '';
-	
+
 		//use the destination_uuid to set the condition_expression_1
 		if (is_uuid($destination_uuid)) {
 			$sql = "select * from v_destinations ";
@@ -110,7 +110,7 @@
 			}
 			unset($sql, $parameters, $row);
 		}
-	
+
 		if (permission_exists("inbound_route_advanced") && $action == "advanced") {
 			//allow users with group advanced control, not always superadmin. You may change this in group permissions
 		}
@@ -503,6 +503,7 @@
 	echo $text['description-dialplan-inbound-add']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap>\n";
@@ -807,6 +808,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	if ($action == "update" && permission_exists("inbound_route_edit")) {
@@ -819,4 +821,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php
index fe2fe629e8..eaa88c1a9c 100644
--- a/app/dialplans/dialplan_add.php
+++ b/app/dialplans/dialplan_add.php
@@ -111,11 +111,11 @@
 				require_once "resources/footer.php";
 				return;
 			}
-	
+
 		//remove the invalid characters from the extension name
 			$dialplan_name = str_replace(" ", "_", $dialplan_name);
 			$dialplan_name = str_replace("/", "", $dialplan_name);
-	
+
 		//add the main dialplan include entry
 			$dialplan_uuid = uuid();
 			$array['dialplans'][0]['domain_uuid'] = $domain_uuid;
@@ -149,7 +149,7 @@
 				$array['dialplan_details'][1]['dialplan_detail_data'] = $condition_expression_2;
 				$array['dialplan_details'][1]['dialplan_detail_order'] = '2';
 			}
-	
+
 		//add action 1
 			$dialplan_detail_uuid = uuid();
 			$array['dialplan_details'][2]['domain_uuid'] = $domain_uuid;
@@ -161,7 +161,7 @@
 				$array['dialplan_details'][2]['dialplan_detail_data'] = $action_data_1;
 			}
 			$array['dialplan_details'][2]['dialplan_detail_order'] = '3';
-	
+
 		//add action 2
 			if (!empty($action_application_2)) {
 				$dialplan_detail_uuid = uuid();
@@ -175,18 +175,18 @@
 				}
 				$array['dialplan_details'][3]['dialplan_detail_order'] = '4';
 			}
-	
+
 		//execute inserts
 			$database = new database;
 			$database->app_name = 'dialplans';
 			$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 			$database->save($array);
 			unset($array);
-	
+
 		//clear the cache
 			$cache = new cache;
 			$cache->delete("dialplan:".$_SESSION["context"]);
-	
+
 		//send a message and redirect the user
 			message::add($text['message-update']);
 			header("Location: ".PROJECT_PATH."/app/dialplans/dialplans.php");
@@ -249,8 +249,9 @@
 	echo $text['description-dialplan_manager-superadmin']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-name']."\n";
@@ -261,7 +262,7 @@
 	echo "\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	//echo "<tr>\n";
 	//echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	//echo "    Continue\n";
@@ -286,7 +287,7 @@
 	//echo "Extension Continue in most cases this is false. default: false\n";
 	//echo "</td>\n";
 	//echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-condition_1']."\n";
@@ -316,7 +317,7 @@
 		obj.parentNode.removeChild(obj);
 		Replace_condition_field_1(this.objs);
 	}
-	
+
 	function Replace_condition_field_1(obj){
 		obj[2].parentNode.insertBefore(obj[0],obj[2]);
 		obj[0].parentNode.removeChild(obj[1]);
@@ -374,13 +375,13 @@
 	echo "	<div id='desc_condition_expression_1'></div>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-condition_2']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	
+
 	echo "	<table border='0'>\n";
 	echo "	<tr>\n";
 	//echo "	<td align='left'>".$text['label-field']."</td>\n";
@@ -409,7 +410,7 @@
 		obj.parentNode.removeChild(obj);
 		Replace_condition_field_2(this.objs);
 	}
-	
+
 	function Replace_condition_field_2(obj){
 		obj[2].parentNode.insertBefore(obj[0],obj[2]);
 		obj[0].parentNode.removeChild(obj[1]);
@@ -463,7 +464,7 @@
 	echo "	<div id='desc_condition_expression_2'></div>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "    ".$text['label-action_1']."\n";
@@ -472,10 +473,10 @@
 	echo $destination->select('dialplan', 'action_1', escape($action_1 ?? null));
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "    ".$text['label-action_2']."\n";
@@ -484,7 +485,7 @@
 	echo $destination->select('dialplan', 'action_2', escape($action_2 ?? null));
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "	<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo " 		".$text['label-context']."\n";
@@ -494,7 +495,7 @@
 	echo "		<br />\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-order']."\n";
@@ -514,7 +515,7 @@
 	echo "	<br />\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "	<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "		".$text['label-enabled']."\n";
@@ -527,7 +528,7 @@
 	echo "		<br />\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
-	
+
 	echo "<tr>\n";
 	echo "	<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo " 		".$text['label-description']."\n";
@@ -539,6 +540,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	if (!empty($action) && $action == "update") {
@@ -551,4 +553,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php
index 6cddf76467..b93bdc47e1 100644
--- a/app/dialplans/dialplan_edit.php
+++ b/app/dialplans/dialplan_edit.php
@@ -117,7 +117,7 @@
 		$esl = event_socket::create();
 		if ($esl->is_connected()) {
 			$result = event_socket::api('show application');
-			
+
 			$show_applications = explode("\n\n", $result);
 			$raw_applications = explode("\n", $show_applications[0]);
 			unset($result);
@@ -590,6 +590,7 @@
 	echo $text['description-dialplan-edit']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='50%' style='vertical-align: top;'>\n";
@@ -1068,6 +1069,7 @@
 				unset($details);
 
 				echo "</table>";
+				echo "</div>\n";
 
 			} //end if results
 
diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index 440f7e00d8..7ee63f5d36 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.php
@@ -258,6 +258,7 @@
 	echo $text['description-dialplan-edit']."\n";
 	echo "<br />\n";
 
+	echo "<div class='card'>\n";
 	echo "	<textarea name='dialplan_xml' id='dialplan_xml' style='display: none;'>".$dialplan_xml."</textarea>";
 	echo "	<table cellpadding='0' cellspacing='0' border='0' style='width: 100%;'>\n";
 	echo "		<tr>\n";
@@ -329,12 +330,14 @@
 	echo "			</td>\n";
 	echo "		</tr>\n";
 	echo "	</table>\n";
-	echo "	<div id='editor'></div>\n";
-	echo "	<br />\n";
 
-	echo "	<input type='hidden' name='app_uuid' value='".escape($app_uuid ?? null)."'>\n";
-	echo "	<input type='hidden' name='dialplan_uuid' value='".escape($dialplan_uuid ?? null)."'>\n";
-	echo "	<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "	<div id='editor'></div>\n";
+	echo "</div>\n";
+	echo "<br />\n";
+
+	echo "<input type='hidden' name='app_uuid' value='".escape($app_uuid ?? null)."'>\n";
+	echo "<input type='hidden' name='dialplan_uuid' value='".escape($dialplan_uuid ?? null)."'>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 
 	echo "</form>\n";
 
diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php
index 11394b6ff8..9b3f77cad7 100644
--- a/app/dialplans/dialplans.php
+++ b/app/dialplans/dialplans.php
@@ -498,6 +498,7 @@
 	}
 	echo "\n<br /><br />\n";
 
+
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='app_uuid' name='app_uuid' value='".escape($app_uuid)."'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
@@ -506,6 +507,7 @@
 	echo "<input type='hidden' name='order_by' value=\"".escape($order_by)."\">\n";
 	echo "<input type='hidden' name='order' value=\"".escape($order)."\">\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	if (
@@ -634,6 +636,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 
diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php
index c8a1615133..86e66bc7e7 100644
--- a/app/extension_settings/extension_setting_edit.php
+++ b/app/extension_settings/extension_setting_edit.php
@@ -159,8 +159,8 @@
 			$database->app_name = 'extension settings';
 			$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
 			$database->save($array);
-		
-		//clear the cache	
+
+		//clear the cache
 			$sql = "select extension, number_alias, user_context from v_extensions ";
 			$sql .= "where extension_uuid = :extension_uuid ";
 			$parameters['extension_uuid'] = $extension_uuid;
@@ -169,7 +169,7 @@
 			$cache = new cache;
 			$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
 			$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
-		
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
@@ -260,6 +260,7 @@
 		}
 	}
 
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	//echo "<tr>\n";
@@ -369,6 +370,7 @@
 	echo "</tr>\n";
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br /><br />\n";
 
 	echo "<input type='hidden' name='extension_uuid' value='".$extension_uuid."'>\n";
diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
index 1aeee73236..63b8920921 100644
--- a/app/extension_settings/extension_settings.php
+++ b/app/extension_settings/extension_settings.php
@@ -226,6 +226,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";
 	if (!empty($extension_settings)) {
 		//define the variable
@@ -319,7 +320,9 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
+
 	echo "<div align='center'>".$paging_controls."</div>\n";
 	echo "<input type='hidden' name='".$id."' value='".$extension_uuid."'>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php
index 30909f4822..9d5d3e7e23 100644
--- a/app/extensions/extension_download.php
+++ b/app/extensions/extension_download.php
@@ -183,6 +183,7 @@
 	echo $text['description-extension_export'];
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
 	echo "	<th class='checkbox'>\n";
@@ -206,6 +207,7 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br />\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
@@ -213,4 +215,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 0af169bc11..b8dd6f5a17 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -1140,6 +1140,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";
@@ -2284,6 +2285,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	if (isset($page) && is_numeric($page)) {
@@ -2313,4 +2315,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/extension_imports.php b/app/extensions/extension_imports.php
index 5283eef89c..47562ae405 100644
--- a/app/extensions/extension_imports.php
+++ b/app/extensions/extension_imports.php
@@ -164,6 +164,7 @@
 			echo $text['description-import']."\n";
 			echo "<br /><br />\n";
 
+			echo "<div class='card'>\n";
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 			//loop through user columns
@@ -202,6 +203,7 @@
 			}
 
 			echo "</table>\n";
+			echo "</div>\n";
 			echo "<br /><br />\n";
 
 			echo "<input name='action' type='hidden' value='import'>\n";
@@ -365,7 +367,6 @@
 
 //show content
 	echo "<form name='frmUpload' method='post' enctype='multipart/form-data'>\n";
-
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-extension_import']."</b></div>\n";
 	echo "	<div class='actions'>\n";
@@ -378,6 +379,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";
@@ -448,6 +450,7 @@
 	echo "</tr>\n";
 
 	echo "</table>\n";
+	echo "</div>\n";
 	echo "<br><br>";
 
 	echo "<input name='type' type='hidden' value='csv'>\n";
@@ -458,4 +461,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 17ad8a9303..68b437ecb2 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -294,6 +294,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('extension_enabled') || permission_exists('extension_delete')) {
@@ -431,6 +432,8 @@
 	}
 
 	echo "</table>\n";
+	echo "</div>\n";
+
 	echo "<br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 1060d6cde0..dcb82c34f1 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -391,7 +391,7 @@
 	echo "<br /><br />\n";
 
 	echo "<form name='frm' id='frm' method='post'>\n";
-
+	echo "<div class='card'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
@@ -930,7 +930,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "<br><br>";
+	echo "</div>\n";
 
 	if ($action == "update") {
 		echo "<input type='hidden' name='gateway_uuid' value='".escape($gateway_uuid)."'>\n";
@@ -938,6 +938,7 @@
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 
 	echo "</form>";
+	echo "<br><br>";
 
 //hide password fields before submit
 	echo "<script>\n";
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index a14388c6af..da57362aed 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -253,6 +253,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('gateway_add') || permission_exists('gateway_edit') || permission_exists('gateway_delete')) {
@@ -378,7 +379,8 @@
 	unset($gateways);
 
 	echo "</table>\n";
-	echo "<br />\n";
+	echo "</div>\n";
+	echo "<br /><br />\n";
 	echo "<div align='center'>".$paging_controls."</div>\n";
 
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
@@ -388,4 +390,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index acbf77577c..4696c4c95b 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -372,6 +372,8 @@ if (!empty($_POST) && 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";
@@ -785,18 +787,21 @@ if (!empty($_POST) && empty($_POST["persistformvar"])) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br />";
 	echo "</form>";
 
 	echo "<script>\n";
-//hide/convert password fields then submit form
+	echo "	//hide/convert password fields then submit form\n";
 	echo "	function submit_form() {\n";
 	echo "		hide_password_fields();\n";
 	echo "		$('form#frm').submit();\n";
 	echo "	}\n";
-//define lowercase class
+	echo "\n";
+	echo "	//define lowercase class\n";
 	echo "	$('.lowercase').on('blur',function(){ this.value = this.value.toLowerCase(); });";
-//show order if array
+	echo "\n";
+	echo "	//show order if array\n";
 	echo "	$('#user_setting_name').on('keyup',function(){ \n";
 	echo "		(this.value.toLowerCase() == 'array') ? $('#tr_order').slideDown('fast') : $('#tr_order').slideUp('fast');\n";
 	echo "	});\n";
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index f272ce402d..7da9e9be7a 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -196,6 +196,7 @@
 	echo "<input type='hidden' name='action' id='action' value=''>\n";
 	echo "<input type='hidden' name='user_uuid' value='".$user_uuid."'>\n";
 
+	echo "<div class='card'>\n";
 	echo "<table class='list'>\n";
 	if (!empty($user_settings)) {
 		$previous_user_setting_category = '';
@@ -374,6 +375,7 @@
 	unset($user_settings);
 
 	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/users/user_edit.php b/core/users/user_edit.php
index e1ddd1ec25..5ecf874610 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -733,6 +733,7 @@
 	echo $text['description-user_edit']."\n";
 	echo "<br /><br />\n";
 
+	echo "<div class='card'>\n";
 	echo "<table cellpadding='0' cellspacing='0' border='0' width='100%'>";
 
 	echo "	<tr>";
@@ -1207,6 +1208,7 @@
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "</div>\n";
 	echo "<br /><br />";
 
 	if ($action == 'edit') {
diff --git a/core/users/user_imports.php b/core/users/user_imports.php
index 49ca8f127e..88549447f4 100644
--- a/core/users/user_imports.php
+++ b/core/users/user_imports.php
@@ -125,7 +125,7 @@
 							$schema[$i]['fields'][] = $field_name;
 						}
 					}
-					$i++;	
+					$i++;
 				}
 			}
 			$schema[$i]['table'] = 'user_groups';
@@ -162,6 +162,7 @@
 			echo $text['description-import']."\n";
 			echo "<br /><br />\n";
 
+			echo "<div class='card'>\n";
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 			//loop through user columns
@@ -198,6 +199,7 @@
 			}
 
 			echo "</table>\n";
+			echo "</div>\n";
 			echo "<br /><br />\n";
 
 			echo "<input name='action' type='hidden' value='import'>\n";
@@ -278,7 +280,7 @@
 
 									//get the line
 									$result = str_getcsv($line, $delimiter, $enclosure);
-									
+
 									//get the table and field name
 									$field_array = explode(".",$value);
 									$table_name = $field_array[0];
@@ -320,7 +322,7 @@
 														$array['user_groups'][$row_id]['user_uuid'] = $user_uuid;
 													}
 												}
-	
+
 												//remove superadmin if not the correct permission
 												if ($group_name == 'superadmin') {
 													if (!permission_exists('group_domain')) {
@@ -413,6 +415,8 @@
 	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";
@@ -492,8 +496,9 @@
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";
-	echo "<br><br>";
+	echo "</div>\n";
 	echo "</form>";
+	echo "<br><br>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/core/users/users.php b/core/users/users.php
index bd80b6a196..7c3e0b8a0c 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -247,6 +247,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('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) {
@@ -326,6 +327,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";