diff --git a/app/call_center/app_languages.php b/app/call_center/app_languages.php
index 6b06304762..acf8dab6a4 100644
--- a/app/call_center/app_languages.php
+++ b/app/call_center/app_languages.php
@@ -629,20 +629,20 @@
 	$text['button-view']['pt-pt'] = "Ver";
 	$text['button-view']['fr-fr'] = "Voir";
 
-	$text['button-load']['en-us'] = "Load";
-	$text['button-load']['es-cl'] = "Cargar";
-	$text['button-load']['pt-pt'] = "Carregar";
-	$text['button-load']['fr-fr'] = "charger";
+	$text['button-start']['en-us'] = "Start";
+	$text['button-start']['es-cl'] = "Iniciar";
+	$text['button-start']['pt-pt'] = "Iniciar";
+	$text['button-start']['fr-fr'] = "Démarrer";
 
-	$text['button-unload']['en-us'] = "Unload";
-	$text['button-unload']['es-cl'] = "Descargar";
-	$text['button-unload']['pt-pt'] = "Descarregar";
-	$text['button-unload']['fr-fr'] = "décharger";
+	$text['button-stop']['en-us'] = "Stop";
+	$text['button-stop']['es-cl'] = "Detener";
+	$text['button-stop']['pt-pt'] = "Parar";
+	$text['button-stop']['fr-fr'] = "Stop";
 
-	$text['button-reload']['en-us'] = "Reload";
-	$text['button-reload']['es-cl'] = "Recargar";
-	$text['button-reload']['pt-pt'] = "Recarregar";
-	$text['button-reload']['fr-fr'] = "recharger";
+	$text['button-restart']['en-us'] = "Restart";
+	$text['button-restart']['es-cl'] = "Reanudar";
+	$text['button-restart']['pt-pt'] = "Restart";
+	$text['button-restart']['fr-fr'] = "Redémarrer";
 
 	$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
 	$text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php
index 2c4c62242c..3762774be0 100644
--- a/app/call_center/call_center_agent_edit.php
+++ b/app/call_center/call_center_agent_edit.php
@@ -56,7 +56,7 @@ else {
 		$agent_call_timeout = check_str($_POST["agent_call_timeout"]);
 		$agent_contact = check_str($_POST["agent_contact"]);
 		$agent_status = check_str($_POST["agent_status"]);
-		$agent_logout = check_str($_POST["agent_logout"]);
+		//$agent_logout = check_str($_POST["agent_logout"]);
 		$agent_no_answer_delay_time = check_str($_POST["agent_no_answer_delay_time"]);
 		$agent_max_no_answer = check_str($_POST["agent_max_no_answer"]);
 		$agent_wrap_up_time = check_str($_POST["agent_wrap_up_time"]);
@@ -203,7 +203,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "agent_call_timeout, ";
 				$sql .= "agent_contact, ";
 				$sql .= "agent_status, ";
-				$sql .= "agent_logout, ";
+				//$sql .= "agent_logout, ";
 				$sql .= "agent_no_answer_delay_time, ";
 				$sql .= "agent_max_no_answer, ";
 				$sql .= "agent_wrap_up_time, ";
@@ -219,7 +219,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "'$agent_call_timeout', ";
 				$sql .= "'$agent_contact', ";
 				$sql .= "'$agent_status', ";
-				$sql .= "'$agent_logout', ";
+				//$sql .= "'$agent_logout', ";
 				$sql .= "'$agent_no_answer_delay_time', ";
 				$sql .= "'$agent_max_no_answer', ";
 				$sql .= "'$agent_wrap_up_time', ";
@@ -244,7 +244,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "agent_call_timeout = '$agent_call_timeout', ";
 			$sql .= "agent_contact = '$agent_contact', ";
 			$sql .= "agent_status = '$agent_status', ";
-			$sql .= "agent_logout = '$agent_logout', ";
+			//$sql .= "agent_logout = '$agent_logout', ";
 			$sql .= "agent_no_answer_delay_time = '$agent_no_answer_delay_time', ";
 			$sql .= "agent_max_no_answer = '$agent_max_no_answer', ";
 			$sql .= "agent_wrap_up_time = '$agent_wrap_up_time', ";
@@ -280,7 +280,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$agent_call_timeout = $row["agent_call_timeout"];
 			$agent_contact = $row["agent_contact"];
 			$agent_status = $row["agent_status"];
-			$agent_logout = $row["agent_logout"];
+			//$agent_logout = $row["agent_logout"];
 			$agent_no_answer_delay_time = $row["agent_no_answer_delay_time"];
 			$agent_max_no_answer = $row["agent_max_no_answer"];
 			$agent_wrap_up_time = $row["agent_wrap_up_time"];
@@ -310,15 +310,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "	  <br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
-	echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($action == "add") {
 		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-call_center_agent_add']."</b></td>\n";
@@ -331,12 +324,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	echo "<tr>\n";
-	echo "<td align='left' colspan='2'>\n";
-	//echo "Call Center agents settings.<br /><br />\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br />\n";
 
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-agent_name'].":\n";
@@ -412,7 +403,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='agent_status'>\n";
-	echo "	<option value=''></option>\n";
 	if ($agent_status == "Logged Out") {
 		echo "	<option value='Logged Out' SELECTED >".$text['option-logged_out']."</option>\n";
 	}
@@ -498,6 +488,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	/*
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-agent_logout'].":\n";
@@ -508,23 +499,19 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo $text['description-agent_logout']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
+	*/
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='call_center_agent_uuid' value='$call_center_agent_uuid'>\n";
+		echo "		<input type='hidden' name='call_center_agent_uuid' value='$call_center_agent_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br /><input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //footer
 	require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php
index 06642d6796..2c1aa6cb70 100644
--- a/app/call_center/call_center_agents.php
+++ b/app/call_center/call_center_agents.php
@@ -50,13 +50,7 @@ require_once "resources/paging.php";
 	$order = $_GET["order"];
 
 //show content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"center\">\n";
-	echo "		<br>";
-
-	echo "<table width='100%' border='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='50%' align='left' nowrap='nowrap'><b>".$text['header-call_center_agents']."</b></td>\n";
 	echo "<td width='50%' align='right'>\n";
@@ -113,9 +107,7 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-
 	echo "<tr>\n";
 	//echo th_order_by('domain_uuid', 'domain_uuid', $order_by, $order);
 	echo th_order_by('agent_name', $text['label-agent_name'], $order_by, $order);
@@ -190,15 +182,6 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php
index 59d4156a15..5ebc8afad2 100644
--- a/app/call_center/call_center_queue_edit.php
+++ b/app/call_center/call_center_queue_edit.php
@@ -407,7 +407,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (strlen($queue_tier_rules_apply) == 0) { $queue_tier_rules_apply = "false"; }
 	if (strlen($queue_tier_rule_wait_second) == 0) { $queue_tier_rule_wait_second = "3"; }
 	if (strlen($queue_tier_rule_wait_multiply_level) == 0) { $queue_tier_rule_wait_multiply_level = "true"; }
-	if (strlen($queue_tier_rule_no_agent_no_wait) == 0) { $queue_tier_rule_no_agent_no_wait = "false"; }
+	if (strlen($queue_tier_rule_no_agent_no_wait) == 0) { $queue_tier_rule_no_agent_no_wait = "true"; }
 	if (strlen($queue_discard_abandoned_after) == 0) { $queue_discard_abandoned_after = "60"; }
 	if (strlen($queue_abandoned_resume_allowed) == 0) { $queue_abandoned_resume_allowed = "false"; }
 
@@ -421,44 +421,32 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
-	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($action == "add") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-call_center_queue_add']."</b></td>\n";
+		echo "<td align='left' nowrap='nowrap'><b>".$text['header-call_center_queue_add']."</b></td>\n";
 	}
 	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-call_center_queue_edit']."</b></td>\n";
+		echo "<td align='left' nowrap='nowrap'><b>".$text['header-call_center_queue_edit']."</b></td>\n";
 	}
-	echo "<td width='70%' align='right'>\n";
+	echo "<td align='right'>\n";
 	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='call_center_queues.php'\" value='".$text['button-back']."'>\n";
 	if ($action == "update") {
 		echo "  <input type='button' class='btn' value='".$text['button-view']."' onclick=\"document.location.href='".PROJECT_PATH."/app/call_center_active/call_center_active.php?queue_name=$database_queue_name';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-load']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+load+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-unload']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+unload+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
-		echo "  <input type='button' class='btn' value='".$text['button-reload']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+reload+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
 	}
 	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	echo "<tr>\n";
-	echo "<td align='left' colspan='2'>\n";
-	//echo "Call Center queue settings.<br /><br />\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br />\n";
 
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-queue_name'].":\n";
 	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
+	echo "<td width='70%' class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='queue_name' maxlength='255' value=\"$queue_name\">\n";
 	echo "<br />\n";
 	echo $text['description-queue_name']."\n";
@@ -482,7 +470,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_strategy'>\n";
-	echo "	<option value=''></option>\n";
 	if ($queue_strategy == "ring-all") {
 		echo "	<option value='ring-all' selected='selected' >".$text['option-ring_all']."</option>\n";
 	}
@@ -724,7 +711,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_time_base_score'>\n";
-	echo "	<option value=''></option>\n";
 	if ($queue_time_base_score == "system") {
 		echo "	<option value='system' selected='selected' >".$text['option-system']."</option>\n";
 	}
@@ -794,7 +780,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_tier_rules_apply'>\n";
-	echo "	<option value=''></option>\n";
 	if ($queue_tier_rules_apply == "true") {
 		echo "	<option value='true' selected='selected' >".$text['option-true']."</option>\n";
 	}
@@ -830,7 +815,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_tier_rule_wait_multiply_level'>\n";
-	echo "	<option value=''></option>\n";
 	if ($queue_tier_rule_wait_multiply_level == "true") {
 		echo "	<option value='true' selected='selected' >".$text['option-true']."</option>\n";
 	}
@@ -855,7 +839,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_tier_rule_no_agent_no_wait'>\n";
-	echo "	<option value=''></option>\n";
 	if ($queue_tier_rule_no_agent_no_wait == "true") {
 		echo "	<option value='true' selected='selected' >".$text['option-true']."</option>\n";
 	}
@@ -891,19 +874,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='queue_abandoned_resume_allowed'>\n";
-	echo "	<option value=''></option>\n";
-	if ($queue_abandoned_resume_allowed == "true") {
-		echo "	<option value='true' selected='selected' >".$text['option-true']."</option>\n";
-	}
-	else {
-		echo "	<option value='true'>".$text['option-true']."</option>\n";
-	}
 	if ($queue_abandoned_resume_allowed == "false") {
 		echo "	<option value='false' selected='selected' >".$text['option-false']."</option>\n";
 	}
 	else {
 		echo "	<option value='false'>".$text['option-false']."</option>\n";
 	}
+	if ($queue_abandoned_resume_allowed == "true") {
+		echo "	<option value='true' selected='selected' >".$text['option-true']."</option>\n";
+	}
+	else {
+		echo "	<option value='true'>".$text['option-true']."</option>\n";
+	}
 	echo "	</select>\n";
 	echo "<br />\n";
 	echo $text['description-abandoned_resume_allowed']."\n";
@@ -963,16 +945,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "		<input type='hidden' name='delete_type' id='delete_type' value=''>";
 		echo "		<input type='hidden' name='delete_uuid' id='delete_uuid' value=''>";
 	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br /><input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_queues.php b/app/call_center/call_center_queues.php
index 011f3a3eb4..7b5a550730 100644
--- a/app/call_center/call_center_queues.php
+++ b/app/call_center/call_center_queues.php
@@ -50,17 +50,15 @@ require_once "resources/paging.php";
 	$order = $_GET["order"];
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"center\">\n";
-	echo "		<br>";
-
-	echo "<table width='100%' border='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='50%' align='left' nowrap='nowrap'><b>".$text['header-call_center_queues']."</b></td>\n";
 	echo "<td width='50%' align='right'>\n";
-	echo "	<input type='button' class='btn' name='' alt='".$text['button-agents']."' onclick=\"window.location='call_center_agents.php'\" value='".$text['button-agents']."'>\n";
+	echo "  <input type='button' class='btn' value='".$text['button-stop']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+unload+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
+	echo "  <input type='button' class='btn' value='".$text['button-start']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+load+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
+	echo "  <input type='button' class='btn' value='".$text['button-restart']."' onclick=\"document.location.href='cmd.php?cmd=api+callcenter_config+queue+reload+$database_queue_name@".$_SESSION['domain_name']."';\" />\n";
+	echo "	&nbsp;&nbsp;&nbsp;";
+	echo "	<input type='button' class='btn' value='".$text['button-agents']."' alt='".$text['button-agents']."' onclick=\"window.location='call_center_agents.php'\">\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
@@ -111,7 +109,6 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo th_order_by('queue_name', $text['label-queue_name'], $order_by, $order);
@@ -193,15 +190,7 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
 
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
 
 //show the footer
 	require_once "resources/footer.php";