diff --git a/app/calls_active/app_languages.php b/app/calls_active/app_languages.php
index 16be3233d3..31aa670fbf 100644
--- a/app/calls_active/app_languages.php
+++ b/app/calls_active/app_languages.php
@@ -16,14 +16,6 @@ $text['title']['pt-br'] = "Configurações da Conta";
 $text['title']['pl'] = "Ustawienia konta";
 $text['title']['sv-se'] = "Aktiva samtal";
 
-$text['label-transfer']['en-us'] = "Transfer To";
-$text['label-transfer']['es-cl'] = "Transferir a";
-$text['label-transfer']['fr-fr'] = "Transférer à";
-$text['label-transfer']['pt-pt'] = "Transferir Para";
-$text['label-transfer']['pt-br'] = "Tranferência";
-$text['label-transfer']['pl'] = "Transferowanie";
-$text['label-transfer']['sv-se'] = "Överför till";
-
 $text['label-time']['en-us'] = "Time";
 $text['label-time']['es-cl'] = "Tiempo";
 $text['label-time']['fr-fr'] = "Temps";
@@ -120,10 +112,10 @@ $text['label-message']['pt-br'] = "Mensagem";
 $text['label-message']['pl'] = "Wiadomość";
 $text['label-message']['sv-se'] = "Meddelande";
 
-$text['label-hangup']['en-us'] = "hangup";
-$text['label-hangup']['es-cl'] = "terminar";
-$text['label-hangup']['fr-fr'] = "raccrocher";
-$text['label-hangup']['pt-pt'] = "terminar";
+$text['label-hangup']['en-us'] = "Hangup";
+$text['label-hangup']['es-cl'] = "Terminar";
+$text['label-hangup']['fr-fr'] = "Raccrocher";
+$text['label-hangup']['pt-pt'] = "Terminar";
 $text['label-hangup']['pt-br'] = "Desligar";
 $text['label-hangup']['pl'] = "Zakończ rozmowę";
 $text['label-hangup']['sv-se'] = "Avsluta";
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index ef2fb98241..31e6d6136e 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -37,13 +37,11 @@ else {
 	$language = new text;
 	$text = $language->get();
 
-$conference_name = trim($_REQUEST["c"]);
-$tmp_conference_name = str_replace("_", " ", $conference_name);
-
-require_once "resources/header.php";
 $document['title'] = $text['title'];
+require_once "resources/header.php";
+?>
 
-?><script type="text/javascript">
+<script type="text/javascript">
 function loadXmlHttp(url, id) {
 	var f = this;
 	f.xmlHttp = null;
@@ -79,7 +77,7 @@ if (this.xmlHttp.readyState == 4 && (this.xmlHttp.status == 200 || !/^http/.test
 }
 
 var requestTime = function() {
-	var url = 'calls_active_inc.php?c=<?php echo trim($_REQUEST["c"]); ?>';
+	var url = 'calls_active_inc.php<?php if (isset($_REQUEST["debug"])) { echo "?debug"; }?>';
 	new loadXmlHttp(url, 'ajax_reponse');
 	setInterval(function(){new loadXmlHttp(url, 'ajax_reponse');}, 1500);
 }
@@ -91,6 +89,12 @@ else if (window.attachEvent) {
 	window.attachEvent('onload', requestTime);
 }
 
+function hangup(uuid) {
+	if (confirm("<?php echo $text['confirm-hangup']?>")) {
+		send_cmd('calls_exec.php?cmd=uuid_kill%20'+uuid);
+	}
+}
+
 function send_cmd(url) {
 	if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari
 		xmlhttp=new XMLHttpRequest();
@@ -102,63 +106,31 @@ function send_cmd(url) {
 	xmlhttp.send(null);
 	document.getElementById('cmd_reponse').innerHTML=xmlhttp.responseText;
 }
-
-var record_count = 0;
-var cmd;
-var destination;
 </script>
 
 <?php
+echo "<b>".$text['title']."</b>";
+echo "<br><br>\n";
+echo $text['description']."\n";
+echo "<br><br>\n";
 
-
-echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
-echo "	<tr>\n";
-echo "	<td align='left'>";
-echo "		<b>".$text['title']."</b>";
-echo "		<br><br>\n";
-echo "		".$text['description']."\n";
-echo "		<br><br>\n";
-echo "	</td>\n";
-echo "	<td align='right' valign='top'>\n";
-
-echo "		<table>\n";
-echo "		<td align='left' valign='middle'>\n";
-echo "			<div id=\"form_label\">\n";
-echo "			<div id=\"url\"></div>\n";
-echo "		</td>\n";
-echo "		<td align='left' valign='middle'>\n";
-echo "			<div id=\"form_label\"></div><input type=\"text\" class=\"formfld\" style=\"width: 100%;\" id=\"form_value\" name=\"form_value\" />\n";
-echo "		</td>\n";
-echo "		</tr>\n";
-echo "		</table>\n";
-
-echo "	</td>\n";
-echo "	</tr>\n";
-echo "</table>\n";
-
-echo "<div id=\"ajax_reponse\"></div>\n";
-echo "<div id=\"time_stamp\" style=\"visibility:hidden\">".date('Y-m-d-s')."</div>\n";
+echo "<div id='ajax_reponse'></div>\n";
+echo "<div id='time_stamp' style='visibility:hidden'>".date('Y-m-d-s')."</div>\n";
 echo "<br><br><br>";
 
-echo "<script type=\"text/javascript\">\n";
-echo "<!--\n";
-echo "function get_transfer_cmd(uuid) {\n";
-echo "	destination = document.getElementById('form_value').value;\n";
-echo "	cmd = \"uuid_transfer \"+uuid+\" -bleg \"+destination+\" xml ".trim($_SESSION['user_context'])."\";\n";
-echo "	return escape(cmd);\n";
-echo "}\n";
-echo "\n";
-echo "function get_park_cmd(uuid) {\n";
-echo "	cmd = \"uuid_transfer \"+uuid+\" -bleg *6000 xml ".trim($_SESSION['user_context'])."\";\n";
-echo "	return escape(cmd);\n";
-echo "}\n";
-echo "\n";
-echo "function get_record_cmd(uuid, prefix, name) {\n";
-echo "	cmd = \"uuid_record \"+uuid+\" start ".$_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/\"+uuid+\".wav\";\n";
-echo "	return escape(cmd);\n";
-echo "}\n";
-echo "-->\n";
-echo "</script>\n";
-
 require_once "resources/footer.php";
+
+/*
+// deprecated functions for this page
+
+	function get_park_cmd(uuid, context) {
+		cmd = \"uuid_transfer \"+uuid+\" -bleg *6000 xml \"+context;
+		return escape(cmd);
+	}
+
+	function get_record_cmd(uuid, prefix, name) {
+		cmd = \"uuid_record \"+uuid+\" start ".$_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/\"+uuid+\".wav\";
+		return escape(cmd);
+	}
+*/
 ?>
\ No newline at end of file
diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php
index 8bbaba6420..0b48b91138 100644
--- a/app/calls_active/calls_active_inc.php
+++ b/app/calls_active/calls_active_inc.php
@@ -38,6 +38,9 @@ else {
 	$language = new text;
 	$text = $language->get();
 
+//include theme config for button images
+	include_once("themes/".$_SESSION['domain']['template']['name']."/config.php");
+
 //set the command
 	$switch_cmd = 'show channels as json';
 
@@ -70,33 +73,20 @@ else {
 			$row_style["1"] = "row_style1";
 
 		//show the results
-			echo "<div id='cmd_reponse'>\n";
-			echo "</div>\n";
+			echo "<div id='cmd_reponse'></div>\n";
 
-			echo "<table width='100%' border='0' cellpadding='3' cellspacing='0'>\n";
+			echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
-			//echo "<th>ID</th>\n";
-			//echo "<th>UUID</th>\n";
-			//echo "<th>Dir</th>\n";
 			echo "<th>".$text['label-profile']."</th>\n";
 			echo "<th>".$text['label-created']."</th>\n";
-			//echo "<th>Created Epoch</th>\n";
-			//echo "<th>Name</th>\n";
 			echo "<th>".$text['label-number']."</th>\n";
-			//echo "<th>State</th>\n";
 			echo "<th>".$text['label-cid-name']."</th>\n";
 			echo "<th>".$text['label-cid-number']."</th>\n";
-			//echo "<th>IP Addr</th>\n";
 			echo "<th>".$text['label-destination']."</th>\n";
 			echo "<th>".$text['label-app']."</th>\n";
-			//echo "<th>Dialplan</th>\n";
-			//echo "<th>Context</th>\n";
 			echo "<th>".$text['label-codec']."</th>\n";
-			//echo "<th>Read Rate</th>\n";
-			//echo "<th>Write Codec</th>\n";
-			//echo "<th>Write Rate</th>\n";
 			echo "<th>".$text['label-secure']."</th>\n";
-			echo "<th>".$text['label-opt']."</th>\n";
+			echo "<td class='list_control_icon'></td>\n";
 			echo "</tr>\n";
 
 			foreach ($results["rows"] as $row) {
@@ -104,6 +94,9 @@ else {
 					foreach ($row as $key => $value) {
 						$$key = $value;
 					}
+					if (if_group("superadmin") && isset($_REQUEST['debug'])) {
+						echo "<tr><td colspan='20'><pre>".print_r($row, true)."</pre></td></tr>";
+					}
 
 				//get the sip profile
 					$name_array = explode("/", $name);
@@ -119,58 +112,40 @@ else {
 					$cid_num = str_replace("+", "", $cid_num);
 
 				echo "<tr>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$id &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$uuid &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$direction &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$sip_profile &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$created &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$created_epoch &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$name &nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$sip_profile."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$created."&nbsp;</td>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>".$tmp_number."&nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$state &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$cid_name &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$cid_num &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$ip_addr &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$dest &nbsp;</td>\n";
-				if (strlen($application) > 0) {
-					echo "<td valign='top' class='".$row_style[$c]."'>".$application.":".$application_data." &nbsp;</td>\n";
-				}
-				else {
-					echo "<td valign='top' class='".$row_style[$c]."'>&nbsp;</td>\n";
-				}
-				//echo "<td valign='top' class='".$row_style[$c]."'>$dialplan &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$context &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$read_codec:$read_rate / $write_codec:$write_rate &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$read_rate &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$write_codec &nbsp;</td>\n";
-				//echo "<td valign='top' class='".$row_style[$c]."'>$write_rate &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>$secure &nbsp;</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."' style='text-align:center;'>\n";
-				//transfer
-					echo "	<a href='javascript:void(0);' onMouseover=\"document.getElementById('form_label').innerHTML='<strong>".$text['label-transfer']."</strong>';\" onclick=\"send_cmd('calls_exec.php?cmd='+get_transfer_cmd(escape('$uuid')));\">".$text['label-transfer']."</a>&nbsp;\n";
-				//park
-					echo "	<a href='javascript:void(0);' onclick=\"send_cmd('calls_exec.php?cmd='+get_park_cmd(escape('$uuid')));\">".$text['label-park']."</a>&nbsp;\n";
-				//hangup
-					echo "	<a href='javascript:void(0);' onclick=\"confirm_response = confirm('".$text['confirm-hangup']."');if (confirm_response){send_cmd('calls_exec.php?cmd=uuid_kill%20'+(escape('$uuid')));}\">".$text['label-hangup']."</a>&nbsp;\n";
-				//record start/stop
-					$tmp_dir = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d");
-					mkdir($tmp_dir, 0777, true);
-					$tmp_file = $tmp_dir."/".$uuid.".wav";
-					if (file_exists($tmp_file)) {
-						//stop
-						echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=stop&prefix=active_calls_&name='+escape('$cid_num'));\">".$text['label-stop']."</a>&nbsp;\n";
-					}
-					else {
-						//start
-						echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=start&prefix=active_calls_');\">".$text['label-start']."</a>&nbsp;\n";
-					}
-				echo "	&nbsp;";
-				echo "</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$cid_name."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$cid_num."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$dest."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".((strlen($application) > 0) ? $application.":".$application_data : null)."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$read_codec.":".$read_rate." / ".$write_codec.":".$write_rate."&nbsp;</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$secure."&nbsp;</td>\n";
+				echo "<td class='list_control_icons' style='width: 25px; text-align: left;'><a href='javascript:void(0);' alt='".$text['label-hangup']."' onclick=\"hangup(escape('".$uuid."'));\">".$v_link_label_delete."</a></td>\n";
 				echo "</tr>\n";
-				if ($c==0) { $c=1; } else { $c=0; }
+				$c = ($c) ? 0 : 1;
 			}
 			echo "</td>\n";
 			echo "</tr>\n";
 			echo "</table>\n";
 	}
+
+/*
+// deprecated features for this page
+
+	//park
+		echo "	<a href='javascript:void(0);' onclick=\"send_cmd('calls_exec.php?cmd='+get_park_cmd(escape('$uuid'), '".$tmp_domain."'));\">".$text['label-park']."</a>&nbsp;\n";
+	//record start/stop
+		$tmp_dir = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d");
+		mkdir($tmp_dir, 0777, true);
+		$tmp_file = $tmp_dir."/".$uuid.".wav";
+		if (file_exists($tmp_file)) {
+			//stop
+			echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=stop&prefix=active_calls_&name='+escape('$cid_num'));\">".$text['label-stop']."</a>&nbsp;\n";
+		}
+		else {
+			//start
+			echo "	<a href='javascript:void(0);' style='color: #444444;' onclick=\"send_cmd('calls_exec.php?cmd='+get_record_cmd(escape('$uuid'), 'active_calls_', escape('$cid_num'))+'&uuid='+escape('$uuid')+'&action=record&action2=start&prefix=active_calls_');\">".$text['label-start']."</a>&nbsp;\n";
+		}
+*/
 ?>
\ No newline at end of file
diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php
index 19bef1a297..3a5235570b 100644
--- a/app/fifo_list/fifo_list_inc.php
+++ b/app/fifo_list/fifo_list_inc.php
@@ -38,9 +38,8 @@ else {
 	$language = new text;
 	$text = $language->get();
 
-//echo PROJECT_PATH."/themes/".$_SESSION['domain']['template']['name']."/config.php";
-//exit;
-include_once("themes/".$_SESSION['domain']['template']['name']."/config.php");
+//include theme config for button images
+	include_once("themes/".$_SESSION['domain']['template']['name']."/config.php");
 
 $switch_cmd = 'fifo list';
 $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
diff --git a/app/operator_panel/index_inc.php b/app/operator_panel/index_inc.php
index 1c833ebb5d..a1579b9ec1 100644
--- a/app/operator_panel/index_inc.php
+++ b/app/operator_panel/index_inc.php
@@ -372,7 +372,7 @@ foreach ($activity as $extension => $ext) {
 	$block .= "	</tr>";
 	$block .= "</table>";
 
-	if (isset($_GET['debug'])) {
+	if (if_group("superadmin") && isset($_GET['debug'])) {
 		$block .= "<span style='font-size: 10px;'>";
 		$block .= "From ID<br>&nbsp;&nbsp;&nbsp;&nbsp;<strong style='color: maroon'>".$extension."</strong><br>";
 		$block .= "uuid<br>&nbsp;&nbsp;&nbsp;&nbsp;<strong style='color: ".($call_identifier == $ext['uuid'] ? 'blue' : 'black').";'>".$ext['uuid']."</strong><br>";
@@ -430,7 +430,7 @@ else {
 }
 echo "<br><br>";
 
-if (isset($_GET['debug'])) {
+if (if_group("superadmin") && isset($_GET['debug'])) {
 	echo '$activity<br>';
 	echo "<textarea style='width: 100%; height: 600px; overflow: scroll;' onfocus='refresh_stop();' onblur='refresh_start();'>";
 	print_r($activity);