diff --git a/app/call_center_active/app_languages.php b/app/call_center_active/app_languages.php
index e5f56bcab0..f20c87fcb0 100644
--- a/app/call_center_active/app_languages.php
+++ b/app/call_center_active/app_languages.php
@@ -194,20 +194,20 @@
 	$text['label-time_base_score']['fr-fr'] = "Score basé sur le temps";
 	$text['label-time_base_score']['pt-pt'] = "Pontuação baseada no tempo";
 
-	$text['label-total_answered']['en-us'] = "Total Answered";
-	$text['label-total_answered']['es-cl'] = "Total Respondido";
-	$text['label-total_answered']['fr-fr'] = "Total répondu";
-	$text['label-total_answered']['pt-pt'] = "Total Atendidas";
+	$text['label-answered']['en-us'] = "Answered";
+	$text['label-answered']['es-cl'] = "Respondido";
+	$text['label-answered']['fr-fr'] = "Répondu";
+	$text['label-answered']['pt-pt'] = "Atendidas";
 
-	$text['label-total_trying']['en-us'] = "Total Trying";
-	$text['label-total_trying']['es-cl'] = "Total Intentando";
-	$text['label-total_trying']['fr-fr'] = "Total d'essais";
-	$text['label-total_trying']['pt-pt'] = "Total a Tentar";
+	$text['label-trying']['en-us'] = "Trying";
+	$text['label-trying']['es-cl'] = "Intentando";
+	$text['label-trying']['fr-fr'] = "d'essais";
+	$text['label-trying']['pt-pt'] = "Tentar";
 
-	$text['label-total_waiting']['en-us'] = "Total Waiting";
-	$text['label-total_waiting']['es-cl'] = "Total Esperando";
-	$text['label-total_waiting']['fr-fr'] = "Total d'attente";
-	$text['label-total_waiting']['pt-pt'] = "Total em Espera";
+	$text['label-waiting']['en-us'] = "Waiting";
+	$text['label-waiting']['es-cl'] = "Esperando";
+	$text['label-waiting']['fr-fr'] = "d'attente";
+	$text['label-waiting']['pt-pt'] = "Espera";
 
 	$text['label-transfer']['en-us'] = "Transfer";
 	$text['label-transfer']['es-cl'] = "Transferir";
diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php
index 133ee34d09..7e8515fc73 100644
--- a/app/call_center_active/call_center_active.php
+++ b/app/call_center_active/call_center_active.php
@@ -113,18 +113,7 @@ function send_cmd(url) {
 </script>
 
 <?php
-echo "<div align='center'>";
-echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-echo "<tr class='border'>\n";
-echo "	<td align=\"left\">\n";
-
-echo "	<div id=\"ajax_response\">\n";
-echo "	</div>\n";
-
-echo "	</td>";
-echo "	</tr>";
-echo "</table>";
-echo "</div>";
+echo "	<div id='ajax_response'></div>\n";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php
index 02061118ea..3771ca5781 100644
--- a/app/call_center_active/call_center_active_inc.php
+++ b/app/call_center_active/call_center_active_inc.php
@@ -97,14 +97,8 @@ else {
 		//get the agent list
 
 			//show the title
-				echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
-				echo "  <tr>\n";
-				echo "	<td align='left'><b>".$text['header-agents']."</b><br />\n";
-				echo "		".$text['description-agents']."<br />\n";
-				echo "	</td>\n";
-				echo "  </tr>\n";
-				echo "</table>\n";
-				echo "<br />\n";
+				echo "<b>".$text['header-agents']."</b><br />\n";
+				echo $text['description-agents']."<br /><br />\n";
 
 			//send the event socket command and get the response
 				//callcenter_config queue list tiers [queue_name] |
@@ -243,12 +237,12 @@ else {
 					if ($c==0) { $c=1; } else { $c=0; }
 				}
 				echo "</table>\n\n";
-				echo "</br>";
 
 		//add vertical spacing
-			echo "<br />\n";
-			echo "<br />\n";
-			echo "<br />\n";
+			echo "<br />";
+			echo "<br />";
+			echo "<br />";
+			echo "<br />";
 
 
 		//get the queue list
@@ -259,11 +253,26 @@ else {
 				$result = str_to_named_array($event_socket_str, '|');
 
 			//show the title
-				echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
+				$q_waiting=0;
+				$q_trying=0;
+				$q_answered=0;
+
+				echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 				echo "  <tr>\n";
 				echo "	<td align='left'><b>".$text['label-queue'].": ".ucfirst($_GET[queue_name])."</b><br />\n";
 				echo "		".$text['description-queue']."<br />\n";
 				echo "	</td>\n";
+				echo "	<td align='right' valign='top'>";
+				foreach ($result as $row) {
+					$state = $row['state'];
+					$q_trying += ($state == "Trying") ? 1 : 0;
+					$q_waiting += ($state == "Waiting") ? 1 : 0;
+					$q_answered += ($state == "Answered") ? 1 : 0;
+				}
+				echo "		<strong>".$text['label-waiting'].":</strong> <b>".$q_waiting."</b>&nbsp;&nbsp;&nbsp;";
+				echo "		<strong>".$text['label-trying'].":</strong> <b>".$q_trying."</b>&nbsp;&nbsp;&nbsp; ";
+				echo "		<strong>".$text['label-answered'].":</strong> <b>".$q_answered."</b>";
+				echo "	</td>";
 				echo "  </tr>\n";
 				echo "</table>\n";
 				echo "<br />\n";
@@ -275,16 +284,12 @@ else {
 			echo "<th>".$text['label-name']."</th>\n";
 			echo "<th>".$text['label-number']."</th>\n";
 			echo "<th>".$text['label-status']."</th>\n";
-			if (if_group("admin") || if_group("superadmin")) {
+			if ((if_group("admin") || if_group("superadmin"))) {
 				echo "<th>".$text['label-options']."</th>\n";
 			}
 			echo "<th>".$text['label-agent']."</th>\n";
 			echo "</tr>\n";
 
-			$q_waiting=0;
-			$q_trying=0;
-			$q_answered=0;
-
 			foreach ($result as $row) {
 				$queue = $row['queue'];
 				$system = $row['system'];
@@ -302,10 +307,6 @@ else {
 				$serving_agent = $row['serving_agent'];
 				$serving_system = $row['serving_system'];
 				$state = $row['state'];
-				if ($state=="Trying") {$q_trying = $q_trying + 1;}
-				if ($state=="Waiting") {$q_waiting = $q_waiting + 1;}
-				if ($state=="Answered") {$q_answered = $q_answered + 1;}
-
 				$joined_seconds = time() - $joined_epoch;
 				$joined_length_hour = floor($joined_seconds/3600);
 				$joined_length_min = floor($joined_seconds/60 - ($joined_length_hour * 60));
@@ -330,17 +331,19 @@ else {
 				echo "<td valign='top' class='".$row_style[$c]."'>".$state."</td>\n";
 				if (if_group("admin") || if_group("superadmin")) {
 					echo "<td valign='top' class='".$row_style[$c]."'>";
+					if ($state != "Abandoned") {
+						$q_caller_number = urlencode($caller_number);
+						$orig_command="{origination_caller_id_name=eavesdrop,origination_caller_id_number=".$q_caller_number."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26eavesdrop(".$session_uuid.")";
 
-					$q_caller_number = urlencode($caller_number);
-					$orig_command="{origination_caller_id_name=eavesdrop,origination_caller_id_number=".$q_caller_number."}user/".$_SESSION['user']['extension'][0]['user']."@".$_SESSION['domain_name']." %26eavesdrop(".$session_uuid.")";
-
-					//debug
-					//echo $orig_command;
-					//echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=log+".$orig_command.")');}\">log_cmd</a>&nbsp;\n";
-
-					echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=originate+".$orig_command.")');}\">".$text['label-eavesdrop']."</a>&nbsp;\n";
-
+						//debug
+						//echo $orig_command;
+						//echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=log+".$orig_command.")');}\">log_cmd</a>&nbsp;\n";
 
+						echo "  <a href='javascript:void(0);' style='color: #444444;' onclick=\"confirm_response = confirm('".$text['message-confirm']."');if (confirm_response){send_cmd('call_center_exec.php?cmd=originate+".$orig_command.")');}\">".$text['label-eavesdrop']."</a>&nbsp;\n";
+					}
+					else {
+						echo "&nbsp;";
+					}
 					echo "</td>";
 				}
 				echo "<td valign='top' class='".$row_style[$c]."'>".$serving_agent."&nbsp;</td>\n";
@@ -348,8 +351,6 @@ else {
 				if ($c==0) { $c=1; } else { $c=0; }
 			}
 			echo "</table>\n";
-			echo "</br>";
-			echo "<b>".$text['label-total_waiting'].": {$q_waiting}<br>".$text['label-total_trying'].": {$q_trying}<br>".$text['label-total_answered'].": {$q_answered}\n</b>";
 
 		//add vertical spacing
 			echo "<br />\n";
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index d3a2f5cd65..8deb4f3ab8 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -49,13 +49,7 @@ $order_by = $_GET["order_by"];
 $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-active_call_center']."</b></td>\n";
 	echo "<td width='50%' align=\"right\">\n";
@@ -97,7 +91,6 @@ $order = $_GET["order"];
 	$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";
@@ -169,15 +162,6 @@ $order = $_GET["order"];
 	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";