diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index 6d9acbb768..44179e6696 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -41,6 +41,58 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_direction";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_status";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_extension";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_caller_id";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_start_range";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_duration";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_caller_destination";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_destination";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_tta";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_hangup_cause";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_recording";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_order";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_search_advanced";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
@@ -79,11 +131,11 @@
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_b_leg";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "hangup_cause";
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_hangup_cause";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "caller_destination";
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_caller_destination";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index 9cff9a9214..d520c64797 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -2340,21 +2340,21 @@ $text['label-seconds']['ru-ru'] = "Sec";
 $text['label-seconds']['sv-se'] = "Sec";
 $text['label-seconds']['uk-ua'] = "Sec";
 
-$text['description_search']['en-us'] = "<u>Note</u>: Source, Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
+$text['description_search']['en-us'] = "<u>Note</u>: Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
 $text['description_search']['ar-eg'] = "";
-$text['description_search']['de-at'] = "Info: Quelle, Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen."; //copied from de-de
-$text['description_search']['de-ch'] = "Info: Quelle, Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen."; //copied from de-de
-$text['description_search']['de-de'] = "Info: Quelle, Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen.";
-$text['description_search']['es-cl'] = "<u>Atención</u>: Origen, Destino y el identificador de llamadas (CID) campos Nombre apoyan el uso de un <i>asterisco</i> ('*') como carácter comodín.";
-$text['description_search']['es-mx'] = "<u>Atención</u>: Origen, Destino y el identificador de llamadas (CID) campos Nombre apoyan el uso de un <i>asterisco</i> ('*') como carácter comodín."; //copied from es-cl
-$text['description_search']['fr-ca'] = "<u>Attention</u>: Source, Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique."; //copied from fr-fr
-$text['description_search']['fr-fr'] = "<u>Attention</u>: Source, Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique.";
+$text['description_search']['de-at'] = "Info: Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen."; //copied from de-de
+$text['description_search']['de-ch'] = "Info: Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen."; //copied from de-de
+$text['description_search']['de-de'] = "Info: Ziel und Anruferkennung (CID) Namesfelder unterstützen die Verwendung von Stern ('*') als Wildcard Zeichen.";
+$text['description_search']['es-cl'] = "<u>Atención</u>: Destino y el identificador de llamadas (CID) campos Nombre apoyan el uso de un <i>asterisco</i> ('*') como carácter comodín.";
+$text['description_search']['es-mx'] = "<u>Atención</u>: Destino y el identificador de llamadas (CID) campos Nombre apoyan el uso de un <i>asterisco</i> ('*') como carácter comodín."; //copied from es-cl
+$text['description_search']['fr-ca'] = "<u>Attention</u>: Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique."; //copied from fr-fr
+$text['description_search']['fr-fr'] = "<u>Attention</u>: Destination et identification de l'appelant (CID) champs Nom appuient l'utilisation de <i>l'astérisque</i> ('*') comme un caractère générique.";
 $text['description_search']['he-il'] = "";
-$text['description_search']['it-it'] = "<u>Nota</u>: Sorgente, Destinazione e ID Nome Chiamante (CID) supportano l'uso di un <i>asterisco</i> ('*') come carattere jolly.";
+$text['description_search']['it-it'] = "<u>Nota</u>: Destinazione e ID Nome Chiamante (CID) supportano l'uso di un <i>asterisco</i> ('*') come carattere jolly.";
 $text['description_search']['nl-nl'] = "";
 $text['description_search']['pl-pl'] = "Uwaga: Następujące pola: numer dzwoniącego i odbiorcy rozmowy, prezentacja numeru oraz nazwy wspierają gwiazdkę (‘*’) jako symbol wieloznaczny.";
-$text['description_search']['pt-br'] = "Atenção: origem, destino e identificação do chamador (CID) campos Nome apoiar o uso de um asterisco ('*') como um caractere curinga. ";
-$text['description_search']['pt-pt'] = "<u>Atenção</u>: origem, destino e identificação do chamador (CID) campos Nome apoiar o uso de um <i>asterisco</i> ('*') como um caractere curinga.";
+$text['description_search']['pt-br'] = "Atenção: destino e identificação do chamador (CID) campos Nome apoiar o uso de um asterisco ('*') como um caractere curinga. ";
+$text['description_search']['pt-pt'] = "<u>Atenção</u>: destino e identificação do chamador (CID) campos Nome apoiar o uso de um <i>asterisco</i> ('*') como um caractere curinga.";
 $text['description_search']['ro-ro'] = "";
 $text['description_search']['ru-ru'] = "<u>Заметка</u>: Поля 'Источник', 'Назначение' и 'CID Имя' поддерживают использование <i>звездочки</i> ('*') в качестве подстановочного знака.";
 $text['description_search']['sv-se'] = "Notera : Källa, Destination och Nummerpresentation ( CID ) Namn fält stödjer användningen av en asterisk ( ' * ' ) som jokertecken.";
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 17c8d6f7d4..5c904d365c 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -165,176 +165,158 @@
 	echo "	</form>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td align='left' colspan='2'>\n";
+	echo "</table>\n";
 
 	echo $text['description']." \n";
 	echo $text['description2']." \n";
 	echo $text['description-3']." \n";
 	echo $text['description-4']." \n";
-
 	echo "<br /><br />\n";
 
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>\n";
 
 //basic search of call detail records
 	if (permission_exists('xml_cdr_search')) {
-
 		echo "<form method='get' action=''>\n";
 
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr>\n";
-		echo "<td width='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? '19%' : '30%')."' style='vertical-align: top;'>\n";
+		echo "<div class='form_grid'>\n";
 
-		echo "	<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-direction']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left' style='white-space: nowrap;'>\n";
-		echo "				<select name='direction' class='formfld'>\n";
-		echo "					<option value=''></option>\n";
-		echo "					<option value='inbound' ".(($direction == "inbound") ? "selected='selected'" : null).">".$text['label-inbound']."</option>\n";
-		echo "					<option value='outbound' ".(($direction == "outbound") ? "selected='selected'" : null).">".$text['label-outbound']."</option>\n";
-		echo "					<option value='local' ".(($direction == "local") ? "selected='selected'" : null).">".$text['label-local']."</option>\n";
-		echo "				</select>\n";
-		if (permission_exists('xml_cdr_b_leg')){
-			echo "			<select name='leg' class='formfld'>\n";
+		if (permission_exists('xml_cdr_search_direction')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-direction']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
+			echo "			<select name='direction' class='formfld'>\n";
 			echo "				<option value=''></option>\n";
-			echo "				<option value='a'>a-leg</option>\n";
-			echo "				<option value='b'>b-leg</option>\n";
+			echo "				<option value='inbound' ".(($direction == "inbound") ? "selected='selected'" : null).">".$text['label-inbound']."</option>\n";
+			echo "				<option value='outbound' ".(($direction == "outbound") ? "selected='selected'" : null).">".$text['label-outbound']."</option>\n";
+			echo "				<option value='local' ".(($direction == "local") ? "selected='selected'" : null).">".$text['label-local']."</option>\n";
 			echo "			</select>\n";
+			if (permission_exists('xml_cdr_b_leg')){
+				echo "		<select name='leg' class='formfld'>\n";
+				echo "			<option value=''></option>\n";
+				echo "			<option value='a'>a-leg</option>\n";
+				echo "			<option value='b'>b-leg</option>\n";
+				echo "		</select>\n";
+			}
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-status']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left'>\n";
-		echo "				<select name='call_result' class='formfld'>\n";
-		echo "					<option value=''></option>\n";
-		echo "					<option value='answered' ".(($call_result == 'answered') ? 'selected' : null).">".$text['label-answered']."</option>\n";
-		echo "					<option value='missed' ".(($call_result == 'missed') ? 'selected' : null).">".$text['label-missed']."</option>\n";
-		echo "					<option value='voicemail' ".(($call_result == 'voicemail') ? 'selected' : null).">".$text['label-voicemail']."</option>\n";
-		echo "					<option value='cancelled' ".(($call_result == 'cancelled') ? 'selected' : null).">".$text['label-cancelled']."</option>\n";
-		echo "					<option value='failed' ".(($call_result == 'failed') ? 'selected' : null).">".$text['label-failed']."</option>\n";
-		echo "				</select>\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		if (permission_exists('xml_cdr_search_advanced')) {
+		if (permission_exists('xml_cdr_search_status')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-status']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
+			echo "			<select name='call_result' class='formfld'>\n";
+			echo "				<option value=''></option>\n";
+			echo "				<option value='answered' ".(($call_result == 'answered') ? 'selected' : null).">".$text['label-answered']."</option>\n";
+			echo "				<option value='missed' ".(($call_result == 'missed') ? 'selected' : null).">".$text['label-missed']."</option>\n";
+			echo "				<option value='voicemail' ".(($call_result == 'voicemail') ? 'selected' : null).">".$text['label-voicemail']."</option>\n";
+			echo "				<option value='cancelled' ".(($call_result == 'cancelled') ? 'selected' : null).">".$text['label-cancelled']."</option>\n";
+			echo "				<option value='failed' ".(($call_result == 'failed') ? 'selected' : null).">".$text['label-failed']."</option>\n";
+			echo "			</select>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
+		}
+		if (permission_exists('xml_cdr_search_extension')) {
 			$sql = "select extension_uuid, extension, number_alias from v_extensions ";
 			$sql .= "where domain_uuid = :domain_uuid ";
 			$sql .= "order by extension asc, number_alias asc ";
 			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 			$database = new database;
 			$result_e = $database->select($sql, $parameters, 'all');
-			echo "		<tr>\n";
-			echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-			echo "				".$text['label-extension']."\n";
-			echo "			</td>\n";
-			echo "			<td class='vtable' align='left'>\n";
-			echo "				<select class='formfld' name='extension_uuid' id='extension_uuid'>\n";
-			echo "					<option value=''></option>";
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-extension']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
+			echo "			<select class='formfld' name='extension_uuid' id='extension_uuid'>\n";
+			echo "				<option value=''></option>";
 			if (is_array($result_e) && @sizeof($result_e) != 0) {
 				foreach ($result_e as &$row) {
 					$selected = ($row['extension_uuid'] == $extension_uuid) ? "selected" : null;
-					echo "			<option value='".escape($row['extension_uuid'])."' ".escape($selected).">".((is_numeric($row['extension'])) ? escape($row['extension']) : escape($row['number_alias'])." (".escape($row['extension']).")")."</option>";
+					echo "		<option value='".escape($row['extension_uuid'])."' ".escape($selected).">".((is_numeric($row['extension'])) ? escape($row['extension']) : escape($row['number_alias'])." (".escape($row['extension']).")")."</option>";
 				}
 			}
-			echo "				</select>\n";
-			echo "			</td>\n";
-			echo "		</tr>\n";
+			echo "			</select>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 			unset($sql, $parameters, $result_e, $row, $selected);
 		}
-		echo "	</table>\n";
-
-		echo "</td>";
-		echo "<td width='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? '30%' : '40%')."' style='vertical-align: top;'>\n";
-
-		echo "	<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-caller_id']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left'>\n";
-		echo "				<input type='text' class='formfld' name='caller_id_name' style='min-width: 115px; width: 115px;' placeholder=\"".$text['label-name']."\" value='".escape($caller_id_name)."'>\n";
-		echo "				<input type='text' class='formfld' name='caller_id_number' style='min-width: 115px; width: 115px;' placeholder=\"".$text['label-number']."\" value='".escape($caller_id_number)."'>\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-start_range']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left' style='position: relative; min-width: 250px;'>\n";
-		echo "				<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_begin' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='".escape($start_stamp_begin)."'>\n";
-		echo "				<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_end' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='".escape($start_stamp_end)."'>\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		if (permission_exists('xml_cdr_search_advanced')) {
-			echo "		<tr>\n";
-			echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-			echo "				".$text['label-duration']." (".$text['label-seconds'].")\n";
-			echo "			</td>\n";
-			echo "			<td class='vtable' align='left'>\n";
-			echo "				<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='duration_min' value='".escape($duration_min)."' placeholder=\"".$text['label-minimum']."\">\n";
-			echo "				<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='duration_max' value='".escape($duration_max)."' placeholder=\"".$text['label-maximum']."\">\n";
-			echo "			</td>\n";
-			echo "		</tr>\n";
+		if (permission_exists('xml_cdr_search_caller_id')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-caller_id']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field nowrap'>\n";
+			echo "			<input type='text' class='formfld' name='caller_id_name' style='min-width: 115px; width: 115px;' placeholder=\"".$text['label-name']."\" value='".escape($caller_id_name)."'>\n";
+			echo "			<input type='text' class='formfld' name='caller_id_number' style='min-width: 115px; width: 115px;' placeholder=\"".$text['label-number']."\" value='".escape($caller_id_number)."'>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		echo "	</table>\n";
-
-		echo "</td>";
-		echo "<td width='".((if_group("admin") || if_group("superadmin") || if_group("cdr")) ? '24%' : '30%')."' style='vertical-align: top;'>\n";
-
-		echo "	<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		if (permission_exists('caller_destination')) {
-			echo "	<tr>\n";
-			echo "		<td class='vncell' valign='top' nowrap='nowrap'>\n";
+		if (permission_exists('xml_cdr_search_start_range')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-start_range']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field nowrap'>\n";
+			echo "			<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_begin' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='".escape($start_stamp_begin)."'>\n";
+			echo "			<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_end' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='".escape($start_stamp_end)."'>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
+		}
+		if (permission_exists('xml_cdr_search_duration')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-duration']." (".$text['label-seconds'].")\n";
+			echo "		</div>\n";
+			echo "		<div class='field nowrap'>\n";
+			echo "			<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='duration_min' value='".escape($duration_min)."' placeholder=\"".$text['label-minimum']."\">\n";
+			echo "			<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='duration_max' value='".escape($duration_max)."' placeholder=\"".$text['label-maximum']."\">\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
+		}
+		if (permission_exists('xml_cdr_search_caller_destination')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
 			echo "			".$text['label-caller_destination']."\n";
-			echo "		</td>\n";
-			echo "		<td class='vtable' align='left'>\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
 			echo "			<input type='text' class='formfld' name='caller_destination' value='".escape($caller_destination)."'>\n";
-			echo "		</td>\n";
-			echo "	</tr>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-destination']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left' style='white-space: nowrap;'>\n";
-		echo "				<input type='text' class='formfld' name='destination_number' id='destination_number' value='".escape($destination_number)."'>\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		if (permission_exists('xml_cdr_search_advanced')) {
-			echo "		<tr>\n";
-			echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-			echo "				".$text['label-tta']." (".$text['label-seconds'].")\n";
-			echo "			</td>\n";
-			echo "			<td class='vtable' align='left' style='white-space: nowrap;'>\n";
-			echo "				<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='tta_min' id='tta_min' value='".escape($tta)."' placeholder=\"".$text['label-minimum']."\">\n";
-			echo "				<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='tta_max' id='tta_max' value='".escape($tta)."' placeholder=\"".$text['label-maximum']."\">\n";
-			echo "			</td>\n";
-			echo "		</tr>\n";
+		if (permission_exists('xml_cdr_search_destination')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-destination']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
+			echo "			<input type='text' class='formfld' name='destination_number' id='destination_number' value='".escape($destination_number)."'>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
+		}
+		if (permission_exists('xml_cdr_search_tta')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-tta']." (".$text['label-seconds'].")\n";
+			echo "		</div>\n";
+			echo "		<div class='field nowrap'>\n";
+			echo "			<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='tta_min' id='tta_min' value='".escape($tta)."' placeholder=\"".$text['label-minimum']."\">\n";
+			echo "			<input type='text' class='formfld' style='min-width: 75px; width: 75px;' name='tta_max' id='tta_max' value='".escape($tta)."' placeholder=\"".$text['label-maximum']."\">\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		echo "	</table>\n";
 
-		echo "</td>";
-		echo "<td width='27%' style='vertical-align: top;'>\n";
-
-		echo "	<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "		<tr>\n";
-		if (permission_exists('hangup_cause')) {
-			echo "		<td class='vncell' valign='top' nowrap='nowrap'>\n";
+		if (permission_exists('xml_cdr_search_hangup_cause')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
 			echo "			".$text['label-hangup_cause']."\n";
-			echo "		</td>\n";
-			echo "		<td class='vtable' align='left'>\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
 			echo "			<select name='hangup_cause' class='formfld'>\n";
 			echo "				<option value=''></option>\n";
-
 			$cdr_status_options = array(
 				'NORMAL_CLEARING',
 				'ORIGINATOR_CANCEL',
@@ -373,98 +355,88 @@
 				echo "			<option value='".escape($cdr_status)."' ".escape($selected).">".escape($cdr_status_label)."</option>\n";
 			}
 			echo "			</select>\n";
-			echo "		</td>\n";
-			echo "	</tr>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		echo "		<tr>\n";
-		echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-		echo "				".$text['label-order']."\n";
-		echo "			</td>\n";
-		echo "			<td class='vtable' align='left' style='white-space: nowrap;'>\n";
-		echo "				<select name='order_by' class='formfld'>\n";
-		if (permission_exists('xml_cdr_extension')) {
-			echo "				<option value='extension' ".($order_by == 'extension' ? "selected='selected'" : null).">".$text['label-extension']."</option>\n";
+		if (permission_exists('xml_cdr_search_recording')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-recording']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field'>\n";
+			echo "			<select name='recording' class='formfld'>\n";
+			echo "				<option value=''></option>\n";
+			echo "				<option value='true' ".($recording == 'true' ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
+			echo "				<option value='false' ".($recording == 'false' ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+			echo "			</select>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
-		if (permission_exists('xml_cdr_all')) {
-			echo "				<option value='domain_name' ".($order_by == 'domain_name' ? "selected='selected'" : null).">".$text['label-domain']."</option>\n";
-		}
-		echo "					<option value='caller_id_name' ".($order_by == 'caller_id_name' ? "selected='selected'" : null).">".$text['label-caller_id_name']."</option>\n";
-		echo "					<option value='caller_id_number' ".($order_by == 'caller_id_number' ? "selected='selected'" : null).">".$text['label-caller_id_number']."</option>\n";
-		if (permission_exists('caller_destination')) {
-			echo "				<option value='caller_destination' ".($order_by == 'caller_destination' ? "selected='selected'" : null).">".$text['label-caller_destination']."</option>\n";
-		}
-		echo "					<option value='destination_number' ".($order_by == 'destination_number' ? "selected='selected'" : null).">".$text['label-destination']."</option>\n";
-		echo "					<option value='start_stamp' ".($order_by == 'start_stamp' || $order_by == '' ? "selected='selected'" : null).">".$text['label-start']."</option>\n";
-		echo "					<option value='tta' ".($order_by == 'tta' ? "selected='selected'" : null).">".$text['label-tta']."</option>\n";
-		echo "					<option value='duration' ".($order_by == 'duration' ? "selected='selected'" : null).">".$text['label-duration']."</option>\n";
-		if (permission_exists('xml_cdr_pdd')) {
-			echo "				<option value='pdd_ms' ".($order_by == 'pdd_ms' ? "selected='selected'" : null).">".$text['label-pdd']."</option>\n";
-		}
-		if (permission_exists('xml_cdr_mos')) {
-			echo "				<option value='rtp_audio_in_mos' ".($order_by == 'rtp_audio_in_mos' ? "selected='selected'" : null).">".$text['label-mos']."</option>\n";
-		}
-		if (permission_exists('hangup_cause')) {
-			echo "				<option value='hangup_cause' ".($order_by == 'desc' ? "selected='selected'" : null).">".$text['label-hangup_cause']."</option>\n";
-		}
-
-		if (is_array($_SESSION['cdr']['field'])) {
-			echo "				<option value='' disabled='disabled'></option>\n";
-			echo "				<optgroup label=\"".$text['label-custom_cdr_fields']."\">\n";
-			foreach ($_SESSION['cdr']['field'] as $field) {
-				$array = explode(",", $field);
-				$field_name = end($array);
-				$field_label = ucwords(str_replace("_", " ", $field_name));
-				$field_label = str_replace("Sip", "SIP", $field_label);
-				if ($field_name != "destination_number") {
-					echo "			<option value='".$field_name."' ".($order_by == $field_name ? "selected='selected'" : null).">".$field_label."</option>\n";
-				}
+		if (permission_exists('xml_cdr_search_order')) {
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-order']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field nowrap'>\n";
+			echo "			<select name='order_by' class='formfld'>\n";
+			if (permission_exists('xml_cdr_extension')) {
+				echo "			<option value='extension' ".($order_by == 'extension' ? "selected='selected'" : null).">".$text['label-extension']."</option>\n";
 			}
-			echo "				</optgroup>\n";
-		}
-		echo "				</select>\n";
-		echo "				<select name='order' class='formfld'>\n";
-		echo "					<option value='desc' ".($order == 'desc' ? "selected='selected'" : null).">".$text['label-descending']."</option>\n";
-		echo "					<option value='asc' ".($order == 'asc' ? "selected='selected'" : null).">".$text['label-ascending']."</option>\n";
-		echo "				</select>\n";
-		echo "			</td>\n";
-		echo "		</tr>\n";
-		if (permission_exists('xml_cdr_search_advanced')) {
-			echo "		<tr>\n";
-			echo "			<td class='vncell' valign='top' nowrap='nowrap'>\n";
-			echo "				".$text['label-recording']."\n";
-			echo "			</td>\n";
-			echo "			<td class='vtable' align='left' style='white-space: nowrap;'>\n";
-			echo "				<select name='recording' class='formfld'>\n";
-			echo "					<option value=''></option>\n";
-			echo "					<option value='true' ".($recording == 'true' ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
-			echo "					<option value='false' ".($recording == 'false' ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
-			echo "				</select>\n";
-			echo "			</td>\n";
-			echo "		</tr>\n";
+			if (permission_exists('xml_cdr_all')) {
+				echo "			<option value='domain_name' ".($order_by == 'domain_name' ? "selected='selected'" : null).">".$text['label-domain']."</option>\n";
+			}
+			echo "				<option value='caller_id_name' ".($order_by == 'caller_id_name' ? "selected='selected'" : null).">".$text['label-caller_id_name']."</option>\n";
+			echo "				<option value='caller_id_number' ".($order_by == 'caller_id_number' ? "selected='selected'" : null).">".$text['label-caller_id_number']."</option>\n";
+			if (permission_exists('xml_cdr_caller_destination')) {
+				echo "			<option value='caller_destination' ".($order_by == 'caller_destination' ? "selected='selected'" : null).">".$text['label-caller_destination']."</option>\n";
+			}
+			echo "				<option value='destination_number' ".($order_by == 'destination_number' ? "selected='selected'" : null).">".$text['label-destination']."</option>\n";
+			echo "				<option value='start_stamp' ".($order_by == 'start_stamp' || $order_by == '' ? "selected='selected'" : null).">".$text['label-start']."</option>\n";
+			echo "				<option value='tta' ".($order_by == 'tta' ? "selected='selected'" : null).">".$text['label-tta']."</option>\n";
+			echo "				<option value='duration' ".($order_by == 'duration' ? "selected='selected'" : null).">".$text['label-duration']."</option>\n";
+			if (permission_exists('xml_cdr_pdd')) {
+				echo "			<option value='pdd_ms' ".($order_by == 'pdd_ms' ? "selected='selected'" : null).">".$text['label-pdd']."</option>\n";
+			}
+			if (permission_exists('xml_cdr_mos')) {
+				echo "			<option value='rtp_audio_in_mos' ".($order_by == 'rtp_audio_in_mos' ? "selected='selected'" : null).">".$text['label-mos']."</option>\n";
+			}
+			if (permission_exists('xml_cdr_hangup_cause')) {
+				echo "			<option value='hangup_cause' ".($order_by == 'desc' ? "selected='selected'" : null).">".$text['label-hangup_cause']."</option>\n";
+			}
+
+			if (is_array($_SESSION['cdr']['field'])) {
+				echo "			<option value='' disabled='disabled'></option>\n";
+				echo "			<optgroup label=\"".$text['label-custom_cdr_fields']."\">\n";
+				foreach ($_SESSION['cdr']['field'] as $field) {
+					$array = explode(",", $field);
+					$field_name = end($array);
+					$field_label = ucwords(str_replace("_", " ", $field_name));
+					$field_label = str_replace("Sip", "SIP", $field_label);
+					if ($field_name != "destination_number") {
+						echo "		<option value='".$field_name."' ".($order_by == $field_name ? "selected='selected'" : null).">".$field_label."</option>\n";
+					}
+				}
+				echo "			</optgroup>\n";
+			}
+			echo "			</select>\n";
+			echo "			<select name='order' class='formfld'>\n";
+			echo "				<option value='desc' ".($order == 'desc' ? "selected='selected'" : null).">".$text['label-descending']."</option>\n";
+			echo "				<option value='asc' ".($order == 'asc' ? "selected='selected'" : null).">".$text['label-ascending']."</option>\n";
+			echo "			</select>\n";
+			echo "		</div>\n";
+			echo "	</div>\n";
 		}
 
-		echo "	</table>\n";
+		echo "</div>\n";
 
-		echo "</td>";
-
-		echo "</tr>";
-		echo "</table>";
-
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr>";
-		echo "<td style='padding-top: 8px;' align='left'>";
-		echo 	$text['description_search'];
-		echo "</td>";
-		echo "<td style='padding-top: 8px;' align='right' nowrap>";
+		echo "<div style='float: right; padding-top: 8px; margin-left: 20px; white-space: nowrap;'>";
 		if (permission_exists('xml_cdr_all') && $_REQUEST['show'] == 'all') {
 			echo "<input type='hidden' name='show' value='all'>\n";
 		}
-		echo "<input type='button' class='btn' value='".$text['button-reset']."' onclick=\"document.location.href='xml_cdr.php';\">\n";
-		echo "<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-
-		echo "</td>";
-		echo "</tr>";
-		echo "</table>";
+		echo "	<input type='button' class='btn' value='".$text['button-reset']."' onclick=\"document.location.href='xml_cdr.php';\">\n";
+		echo "	<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
+		echo "</div>\n";
+		echo "<div style='font-size: 85%; padding-top: 8px;'>".$text['description_search']."</div>\n";
 
 		echo "</form>";
 		echo "<br /><br />";
@@ -495,7 +467,7 @@
 	}
 	echo "<th>".$text['label-caller_id_name']."</th>\n";
 	echo "<th>".$text['label-caller_id_number']."</th>\n";
-	if (permission_exists('caller_destination')) {
+	if (permission_exists('xml_cdr_caller_destination')) {
 		echo "<th>".$text['label-caller_destination']."</th>\n";
 	}
 	echo "<th>".$text['label-destination']."</th>\n";
@@ -526,7 +498,7 @@
 		echo "<th style='text-align: center;' title=\"".$text['description-mos']."\">".$text['label-mos']."</th>\n";
 		$col_count++;
 	}
-	if (permission_exists('hangup_cause')) {
+	if (permission_exists('xml_cdr_hangup_cause')) {
 		echo "<th>".$text['label-hangup_cause']."</th>\n";
 	}
 	else {
@@ -664,7 +636,7 @@
 					$content .= "		</a>";
 					$content .= "	</td>\n";
 				//caller destination
-					if (permission_exists('caller_destination')) {
+					if (permission_exists('xml_cdr_caller_destination')) {
 						$content .= "	<td valign='top' class='".$row_style[$c]." tr_link_void' nowrap='nowrap'>";
 						$content .= "		<a href=\"javascript:void(0)\" onclick=\"send_cmd('".PROJECT_PATH."/app/click_to_call/click_to_call.php?src_cid_name=".urlencode(escape($row['caller_id_name']))."&src_cid_number=".urlencode(escape($row['caller_id_number']))."&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name'])."&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number'])."&src=".urlencode($_SESSION['user']['extension'][0]['user'])."&dest=".urlencode(escape($row['caller_destination']))."&rec=false&ringback=us-ring&auto_answer=true');\">\n";
 						if (is_numeric($row['caller_destination'])) {
@@ -773,7 +745,7 @@
 						$content .= "	<td valign='top' class='".$row_style[$c]."'$title style='text-align: center;'>$value</td>\n";
 					}
 				//hangup cause/call result
-					if (permission_exists('hangup_cause')) {
+					if (permission_exists('xml_cdr_hangup_cause')) {
 						$content .= "	<td valign='top' class='".$row_style[$c]."' nowrap='nowrap'><a ".$tr_link.">".escape($hangup_cause)."</a></td>\n";
 					}
 					else {
diff --git a/themes/default/css.php b/themes/default/css.php
index 57751129c9..c24f5e2676 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -430,6 +430,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		}
 */
 
+	button.navbar-toggler {
+		min-height: 50px;
+		}
+
 	button.navbar-toggler > span.fas.fa-bars {
 		color: <?php echo ($_SESSION['theme']['menu_main_toggle_color']['text'] != '') ? $_SESSION['theme']['menu_main_toggle_color']['text'] : 'rgba(255,255,255,0.8)'; ?>;
 		}
@@ -575,7 +579,8 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 	/* buttons */
 	input.btn,
-	input.button {
+	input.button,
+	button.btn-default {
 		height: <?php echo ($_SESSION['theme']['button_height']['text'] != '') ? $_SESSION['theme']['button_height']['text'] : '28px'; ?>;
 		padding: <?php echo ($_SESSION['theme']['button_padding']['text'] != '') ? $_SESSION['theme']['button_padding']['text'] : '5px 8px'; ?>;
 		border: <?php echo ($_SESSION['theme']['button_border_size']['text'] != '') ? $_SESSION['theme']['button_border_size']['text'] : '1px'; ?> solid <?php echo ($_SESSION['theme']['button_border_color']['text'] != '') ? $_SESSION['theme']['button_border_color']['text'] : '#242424'; ?>;
@@ -611,7 +616,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	input.btn:focus,
 	input.button:hover,
 	input.button:active,
-	input.button:focus {
+	input.button:focus,
+	button.btn-default:hover,
+	button.btn-default:active,
+	button.btn-default:focus {
 		cursor: pointer;
 		border-color: <?php echo ($_SESSION['theme']['button_border_color_hover']['text'] != '') ? $_SESSION['theme']['button_border_color_hover']['text'] : '#000000'; ?>;
 		<?php
@@ -629,42 +637,11 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		color: <?php echo ($_SESSION['theme']['button_text_color_hover']['text'] != '') ? $_SESSION['theme']['button_text_color_hover']['text'] : '#ffffff'; ?>;
 		}
 
-	/* default bootstrap buttons - not currently used */
-	button.btn-default {
-		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
-		padding: 4px 8px;
-		color: #fff;
-		font-weight: bold;
-		font-size: 8pt;
-		border: 1px solid #26242a;
-		background: #3e3e3e;
-		background-image: -moz-linear-gradient(top, #000 0%, #3e3e3e 100%);
-		background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #000), color-stop(1, #3e3e3e));
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-		-khtml-border-radius: 3px;
-		border-radius: 3px;
-		text-align: center;
-		text-transform: uppercase;
-		/* text-shadow: 0px 0px 1px rgba(0,0,0,0.9); */
-		opacity: 0.9;
-		-moz-opacity: 0.9;
+	button.btn-icon {
+		margin: 0 2px;
 		}
 
-	button.btn-default:hover,
-	button.btn-default:active,
-	button.btn-default:focus {
-		cursor: pointer;
-		color: #ffffff;
-		border: 1px solid #26242a;
-		box-shadow: 0 0 5px #cddaf0;
-		-webkit-box-shadow: 0 0 5px #cddaf0;
-		-moz-box-shadow: 0 0 5px #cddaf0;
-		opacity: 1.0;
-		-moz-opacity: 1.0;
-		}
-
-	/* control icons (must be defined after the default bootstrap buttons) */
+	/* control icons (define after the default bootstrap btn-default class) */
 	button.list_control_icon,
 	button.list_control_icon_disabled {
 		width: 24px;
@@ -964,6 +941,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		margin: 0;
 		}
 
+	form.inline {
+		display: inline-block;
+		}
+
 	/* style placeholder text (for browsers that support the attribute) - note: can't stack, each must be seperate */
 	<?php $placeholder_color = ($_SESSION['theme']['input_text_placeholder_color']['text'] != '') ? $_SESSION['theme']['input_text_placeholder_color']['text'].';' : '#999999; opacity: 1.0;'; ?>
 	::-webkit-input-placeholder { color: <?php echo $placeholder_color; ?> } /* chrome/opera/safari */
@@ -1217,6 +1198,10 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		display: inline;
 		}
 
+	input[type=checkbox] {
+		margin-top: 2px;
+		}
+
 	label {
 		font-weight: normal;
 		vertical-align: middle;
@@ -1523,7 +1508,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	.message_text {
 		z-index: 99999;
 		margin: 0 auto;
-		padding: 10px;
+		padding: 15px;
 		text-align: center;
 		font-family: arial, san-serif;
 		font-size: 10pt;
@@ -1974,3 +1959,80 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		background-image: none;
 		background-color: #fff;
 		}
+
+/* CSS GRID ********************************************************************/
+
+	div.form_grid {
+		width: 100%;
+		display: grid;
+		grid-gap: 0;
+		grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
+		}
+
+	div.form_set {
+		width: 100%;
+		display: grid;
+		grid_gap: 0;
+		grid-template-columns: 150px minmax(200px, 1fr);
+		}
+
+	div.form_set > .label {
+		background: <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		<?php $br = format_border_radius($_SESSION['theme']['form_table_label_border_radius']['text'], '4px'); ?>
+		-moz-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-webkit-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-khtml-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		<?php unset($br); ?>
+		border-right: 3px solid <?php echo ($_SESSION['theme']['form_table_label_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_background_color']['text'] : '#e5e9f0'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_label_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_border_color']['text'] : '#ffffff'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_label_padding']['text'] != '') ? $_SESSION['theme']['form_table_label_padding']['text'] : '7px 8px'; ?>;
+		text-align: right;
+		color: <?php echo ($_SESSION['theme']['form_table_label_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
+		white-space: nowrap;
+		vertical-align: top;
+		}
+
+	div.form_set > .label.required {
+		background: <?php echo ($_SESSION['theme']['form_table_label_required_background_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_background_color']['text'] : '#e5e9f0'; ?>;
+		<?php $br = format_border_radius($_SESSION['theme']['form_table_label_border_radius']['text'], '4px'); ?>
+		-moz-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-webkit-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-khtml-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		<?php unset($br); ?>
+		border-right: 3px solid <?php echo ($_SESSION['theme']['form_table_label_required_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_border_color']['text'] : '#cbcfd5'; ?>;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_label_border_color']['text'] != '') ? $_SESSION['theme']['form_table_label_border_color']['text'] : '#ffffff'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_label_padding']['text'] != '') ? $_SESSION['theme']['form_table_label_padding']['text'] : '7px 8px'; ?>;
+		text-align: right;
+		color: <?php echo ($_SESSION['theme']['form_table_label_required_text_color']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_color']['text'] : '#000000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_label_text_font']['text'] != '') ? $_SESSION['theme']['form_table_label_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_label_text_size']['text'] != '') ? $_SESSION['theme']['form_table_label_text_size']['text'] : '9pt'; ?>;
+		font-weight: <?php echo ($_SESSION['theme']['form_table_label_required_text_weight']['text'] != '') ? $_SESSION['theme']['form_table_label_required_text_weight']['text'] : 'bold'; ?>;
+		white-space: nowrap;
+		vertical-align: top;
+		}
+
+	div.form_set > .field {
+		background: <?php echo ($_SESSION['theme']['form_table_field_background_color']['text'] != '') ? $_SESSION['theme']['form_table_field_background_color']['text'] : '#ffffff'; ?>;
+		<?php $br = format_border_radius($_SESSION['theme']['form_table_field_border_radius']['text'], '0'); ?>
+		-moz-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-webkit-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		-khtml-border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		border-radius: <?php echo $br['tl']['n'].$br['tl']['u']; ?> <?php echo $br['tr']['n'].$br['tr']['u']; ?> <?php echo $br['br']['n'].$br['br']['u']; ?> <?php echo $br['bl']['n'].$br['bl']['u']; ?>;
+		<?php unset($br); ?>
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['form_table_field_border_color']['text'] != '') ? $_SESSION['theme']['form_table_field_border_color']['text'] : '#e5e9f0'; ?>;
+		padding: <?php echo ($_SESSION['theme']['form_table_field_padding']['text'] != '') ? $_SESSION['theme']['form_table_field_padding']['text'] : '6px'; ?>;
+		text-align: left;
+		vertical-align: middle;
+		color: <?php echo ($_SESSION['theme']['form_table_field_text_color']['text'] != '') ? $_SESSION['theme']['form_table_field_text_color']['text'] : '#666666'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['form_table_field_text_font']['text'] != '') ? $_SESSION['theme']['form_table_field_text_font']['text'] : 'Arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['form_table_field_text_size']['text'] != '') ? $_SESSION['theme']['form_table_field_text_size']['text'] : '8pt'; ?>;
+		position: relative;
+		}
+
+	div.form_set > .field.nowrap {
+		white-space: nowrap;
+		}
\ No newline at end of file