diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index 7f880e02a1..f933103ffc 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -119,7 +119,8 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<b style='float: left;'>".$text['title-access_controls']." (".$num_rows.")</b>\n";
+	echo "	<div class='heading'><b>".$text['title-access_controls']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='buttons'>\n";
 	if (permission_exists('access_control_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>'access_control_edit.php']);
 	}
@@ -129,14 +130,16 @@
 	if (permission_exists('access_control_delete') && $access_controls) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
-	echo "<form id='form_search' class='inline' method='get'>\n";
-	echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo "		<form id='form_search' class='inline' method='get'>\n";
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
-		echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo "	<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
-	echo "</form>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
 	echo $text['description-access_control']."\n";
diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index 14aa00edf9..c371ad6069 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -143,7 +143,8 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<b style='float: left;'>".$text['title-bridges']." (".$num_rows.")</b>\n";
+	echo "	<div class='heading'><b>".$text['title-bridges']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='buttons'>\n";
 	if (permission_exists('bridge_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>'bridge_edit.php']);
 	}
@@ -156,22 +157,24 @@
 	if (permission_exists('bridge_delete') && $bridges) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
+	echo "		<form id='form_search' class='inline' method='get'>\n";
 	if (permission_exists('bridge_all')) {
 		if ($_GET['show'] == 'all') {
-			echo "	<input type='hidden' name='show' value='all'>";
+			echo "		<input type='hidden' name='show' value='all'>";
 		}
 		else {
 			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
 		}
 	}
-	echo "<form id='form_search' class='inline' method='get'>\n";
-	echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
-		echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo "	<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
-	echo "</form>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
 	echo $text['title_description-bridge']."\n";
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 19051e6b31..7af55290ef 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -134,7 +134,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<b style='float: left;'>".$text['title-call-block']." (".$num_rows.")</b>\n";
+	echo "	<div class='heading'><b>".$text['title-call-block']." (".$num_rows.")</b></div>\n";
 	if (permission_exists('call_block_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>'call_block_edit.php']);
 	}
@@ -147,14 +147,16 @@
 	if (permission_exists('call_block_delete') && $result) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
-	echo "<form id='form_search' class='inline' method='get'>\n";
-	echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo "		<form id='form_search' class='inline' method='get'>\n";
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_block.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
-		echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo "	<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
-	echo "</form>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
 	echo $text['description-call-block']."\n";
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 4ed2fdc345..1b7c564636 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -124,7 +124,8 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<b style='float: left;'>".$text['title-call_broadcast']." (".$num_rows.")</b>\n";
+	echo "	<div class='heading'><b>".$text['title-call_broadcast']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='buttons'>\n";
 	if (permission_exists('call_broadcast_add')) {
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'link'=>'call_broadcast_edit.php']);
 	}
@@ -134,14 +135,16 @@
 	if (permission_exists('call_broadcast_delete')) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
-	echo "<form id='form_search' class='inline' method='get'>\n";
-	echo "<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo "		<form id='form_search' class='inline' method='get'>\n";
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
-		echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo "	<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
-	echo "</form>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
 	echo $text['title_description-call_broadcast']."\n";
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 19d0806e75..dddc12b227 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -101,43 +101,44 @@
 
 //page title and description
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<b style='float: left;'>".$text['title-call_detail_records']."</b>\n";
-	echo "	<form id='frm_export' class='inline' method='post' action='xml_cdr_export.php'>\n";
-	echo "	<input type='hidden' name='cdr_id' value='".escape($cdr_id)."'>\n";
-	echo "	<input type='hidden' name='direction' value='".escape($direction)."'>\n";
-	echo "	<input type='hidden' name='caller_id_name' value='".escape($caller_id_name)."'>\n";
-	echo "	<input type='hidden' name='start_stamp_begin' value='".escape($start_stamp_begin)."'>\n";
-	echo "	<input type='hidden' name='start_stamp_end' value='".escape($start_stamp_end)."'>\n";
-	echo "	<input type='hidden' name='hangup_cause' value='".escape($hangup_cause)."'>\n";
-	echo "	<input type='hidden' name='call_result' value='".escape($call_result)."'>\n";
-	echo "	<input type='hidden' name='caller_extension_uuid' value='".escape($caller_extension_uuid)."'>\n";
-	echo "	<input type='hidden' name='caller_id_number' value='".escape($caller_id_number)."'>\n";
-	echo "	<input type='hidden' name='caller_destination' value='".escape($caller_destination)."'>\n";
-	echo "	<input type='hidden' name='destination_number' value='".escape($destination_number)."'>\n";
-	echo "	<input type='hidden' name='context' value='".escape($context)."'>\n";
-	echo "	<input type='hidden' name='answer_stamp_begin' value='".escape($answer_stamp_begin)."'>\n";
-	echo "	<input type='hidden' name='answer_stamp_end' value='".escape($answer_stamp_end)."'>\n";
-	echo "	<input type='hidden' name='end_stamp_begin' value='".escape($end_stamp_begin)."'>\n";
-	echo "	<input type='hidden' name='end_stamp_end' value='".escape($end_stamp_end)."'>\n";
-	echo "	<input type='hidden' name='start_epoch' value='".escape($start_epoch)."'>\n";
-	echo "	<input type='hidden' name='stop_epoch' value='".escape($stop_epoch)."'>\n";
-	echo "	<input type='hidden' name='duration' value='".escape($duration)."'>\n";
-	echo "	<input type='hidden' name='billsec' value='".escape($billsec)."'>\n";
-	echo "	<input type='hidden' name='xml_cdr_uuid' value='".escape($xml_cdr_uuid)."'>\n";
-	echo "	<input type='hidden' name='bleg_uuid' value='".escape($bleg_uuid)."'>\n";
-	echo "	<input type='hidden' name='accountcode' value='".escape($accountcode)."'>\n";
-	echo "	<input type='hidden' name='read_codec' value='".escape($read_codec)."'>\n";
-	echo "	<input type='hidden' name='write_codec' value='".escape($write_codec)."'>\n";
-	echo "	<input type='hidden' name='remote_media_ip' value='".escape($remote_media_ip)."'>\n";
-	echo "	<input type='hidden' name='network_addr' value='".escape($network_addr)."'>\n";
-	echo "	<input type='hidden' name='bridge_uuid' value='".escape($bridge_uuid)."'>\n";
-	echo "	<input type='hidden' name='leg' value='".escape($leg)."'>\n";
+	echo "	<div class='heading'><b>".$text['title-call_detail_records']."</b></div>\n";
+	echo "	<div class='buttons'>\n";
+	echo "		<form id='frm_export' class='inline' method='post' action='xml_cdr_export.php'>\n";
+	echo "		<input type='hidden' name='cdr_id' value='".escape($cdr_id)."'>\n";
+	echo "		<input type='hidden' name='direction' value='".escape($direction)."'>\n";
+	echo "		<input type='hidden' name='caller_id_name' value='".escape($caller_id_name)."'>\n";
+	echo "		<input type='hidden' name='start_stamp_begin' value='".escape($start_stamp_begin)."'>\n";
+	echo "		<input type='hidden' name='start_stamp_end' value='".escape($start_stamp_end)."'>\n";
+	echo "		<input type='hidden' name='hangup_cause' value='".escape($hangup_cause)."'>\n";
+	echo "		<input type='hidden' name='call_result' value='".escape($call_result)."'>\n";
+	echo "		<input type='hidden' name='caller_extension_uuid' value='".escape($caller_extension_uuid)."'>\n";
+	echo "		<input type='hidden' name='caller_id_number' value='".escape($caller_id_number)."'>\n";
+	echo "		<input type='hidden' name='caller_destination' value='".escape($caller_destination)."'>\n";
+	echo "		<input type='hidden' name='destination_number' value='".escape($destination_number)."'>\n";
+	echo "		<input type='hidden' name='context' value='".escape($context)."'>\n";
+	echo "		<input type='hidden' name='answer_stamp_begin' value='".escape($answer_stamp_begin)."'>\n";
+	echo "		<input type='hidden' name='answer_stamp_end' value='".escape($answer_stamp_end)."'>\n";
+	echo "		<input type='hidden' name='end_stamp_begin' value='".escape($end_stamp_begin)."'>\n";
+	echo "		<input type='hidden' name='end_stamp_end' value='".escape($end_stamp_end)."'>\n";
+	echo "		<input type='hidden' name='start_epoch' value='".escape($start_epoch)."'>\n";
+	echo "		<input type='hidden' name='stop_epoch' value='".escape($stop_epoch)."'>\n";
+	echo "		<input type='hidden' name='duration' value='".escape($duration)."'>\n";
+	echo "		<input type='hidden' name='billsec' value='".escape($billsec)."'>\n";
+	echo "		<input type='hidden' name='xml_cdr_uuid' value='".escape($xml_cdr_uuid)."'>\n";
+	echo "		<input type='hidden' name='bleg_uuid' value='".escape($bleg_uuid)."'>\n";
+	echo "		<input type='hidden' name='accountcode' value='".escape($accountcode)."'>\n";
+	echo "		<input type='hidden' name='read_codec' value='".escape($read_codec)."'>\n";
+	echo "		<input type='hidden' name='write_codec' value='".escape($write_codec)."'>\n";
+	echo "		<input type='hidden' name='remote_media_ip' value='".escape($remote_media_ip)."'>\n";
+	echo "		<input type='hidden' name='network_addr' value='".escape($network_addr)."'>\n";
+	echo "		<input type='hidden' name='bridge_uuid' value='".escape($bridge_uuid)."'>\n";
+	echo "		<input type='hidden' name='leg' value='".escape($leg)."'>\n";
 	if (is_array($_SESSION['cdr']['field'])) {
 		foreach ($_SESSION['cdr']['field'] as $field) {
 			$array = explode(",", $field);
 			$field_name = $array[count($array) - 1];
 			if (isset($_REQUEST[$field_name])) {
-				echo "	<input type='hidden' name='".escape($field_name)."' value='".escape($$field_name)."'>\n";
+				echo "<input type='hidden' name='".escape($field_name)."' value='".escape($$field_name)."'>\n";
 			}
 		}
 	}
@@ -149,10 +150,7 @@
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'onclick'=>"if (confirm('".$text['confirm-delete']."')) { list_action_set('delete'); list_form_submit('form_list'); } else { this.blur(); return false; }"]);
 	}
 	if (permission_exists('xml_cdr_all')) {
-		if ($_REQUEST['show'] == 'all') {
-			echo "	<input type='hidden' name='show' value='all'>\n";
-		}
-		else {
+		if (!$_REQUEST['show'] == 'all') {
 			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
 		}
 	}
@@ -164,16 +162,18 @@
 		echo button::create(['type'=>'button','label'=>$text['button-archive'],'icon'=>'archive','link'=>'xml_cdr_archive.php'.($_REQUEST['show'] == 'all' ? '?show=all' : null)]);
 	}
 	echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>'file-export','onclick'=>"toggle_select('export_format'); this.blur();"]);
-	echo "<select class='formfld' style='display: none; width: auto;' name='export_format' id='export_format' onchange=\"display_message('".$text['message-preparing_download']."'); toggle_select('export_format'); document.getElementById('frm_export').submit();\">";
-	echo 	"<option value='' disabled='disabled' selected='selected'>".$text['label-format']."</option>";
-	echo 	"<option value='csv'>CSV</option>";
-	echo 	"<option value='pdf'>PDF</option>";
-	echo "</select>";
+	echo 		"<select class='formfld' style='display: none; width: auto;' name='export_format' id='export_format' onchange=\"display_message('".$text['message-preparing_download']."'); toggle_select('export_format'); document.getElementById('frm_export').submit();\">";
+	echo "			<option value='' disabled='disabled' selected='selected'>".$text['label-format']."</option>";
+	echo "			<option value='csv'>CSV</option>";
+	echo "			<option value='pdf'>PDF</option>";
+	echo "		</select>";
 	echo button::create(['type'=>'button','label'=>$text['button-refresh'],'icon'=>'sync-alt','link'=>'xml_cdr.php']);
 	if ($paging_controls_mini != '') {
-		echo "<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
+		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
-	echo "	</form>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
 	echo $text['description']." \n";
@@ -185,6 +185,9 @@
 //basic search of call detail records
 	if (permission_exists('xml_cdr_search')) {
 		echo "<form method='get' action=''>\n";
+		if (permission_exists('xml_cdr_all') && $_REQUEST['show'] == 'all') {
+			echo "<input type='hidden' name='show' value='all'>\n";
+		}
 
 		echo "<div class='form_grid'>\n";
 
diff --git a/themes/default/css.php b/themes/default/css.php
index dad696a3c9..0a03e66e5c 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -2188,10 +2188,20 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		box-shadow: <?php echo ($_SESSION['theme']['action_bar_shadow_scroll']['text'] != '') ? $_SESSION['theme']['action_bar_shadow_scroll']['text'] : '0 3px 3px 0 rgba(0,0,0,0.2)'; ?>;
 		}
 
+	div.action_bar > div.heading {
+		float: left;
+		}
+
+	div.action_bar > div.buttons {
+		float: right;
+		white-space: nowrap;
+		}
+
 /* LIST ************************************************************************/
 
 	.list {
 		width: 100%;
+		empty-cells: show;
 		}
 
 	.list tr {