diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php
index 09361650f7..0e69c68aac 100644
--- a/app/call_center_active/call_center_active.php
+++ b/app/call_center_active/call_center_active.php
@@ -112,6 +112,7 @@ function send_cmd(url) {
 
 <?php
 echo "	<div id='ajax_response'></div>\n";
+echo "<br><br>";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php
index 106cc0e555..b5d596e50a 100644
--- a/app/call_center_active/call_center_queue.php
+++ b/app/call_center_active/call_center_queue.php
@@ -161,6 +161,7 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "<br><br>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index 3124d0300c..ef2fb98241 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -113,10 +113,13 @@ var destination;
 
 echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 echo "	<tr>\n";
-echo "	<td align='left'><b>".$text['title']."</b><br>\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'>\n";
+echo "	<td align='right' valign='top'>\n";
 
 echo "		<table>\n";
 echo "		<td align='left' valign='middle'>\n";
@@ -133,14 +136,9 @@ echo "	</td>\n";
 echo "	</tr>\n";
 echo "</table>\n";
 
-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_reponse\"></div>\n";
-echo "		<div id=\"time_stamp\" style=\"visibility:hidden\">".date('Y-m-d-s')."</div>\n";
-echo "	</td>";
-echo "	</tr>";
-echo "</table>";
+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";
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 56012fa7c2..17bf8dfa16 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -363,6 +363,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	tb.type='text';\n";
 		echo "	tb.name=obj.name;\n";
 		echo "	tb.setAttribute('class', 'formfld');\n";
+		echo "	tb.setAttribute('style', 'width: 350px;');\n";
 		echo "	tb.value=obj.options[obj.selectedIndex].value;\n";
 		echo "	tbb=document.createElement('INPUT');\n";
 		echo "	tbb.setAttribute('class', 'btn');\n";
@@ -505,13 +506,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
-		echo "				<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
+		echo "		<input type='hidden' name='conference_center_uuid' value='$conference_center_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index 76651d1a8d..6ad0f1d275 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -198,7 +198,7 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "<br />";
+	echo "<br /><br />";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 2393fca024..d361cdf3ef 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -520,10 +520,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	<input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
 		echo "	<input type='hidden' name='conference_uuid' value='$conference_uuid'>\n";
 	}
-	echo "		<br><input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "		<br>";
+	echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php
index 7625ce56e2..30ad9bc7f8 100644
--- a/app/conferences_active/conferences_active.php
+++ b/app/conferences_active/conferences_active.php
@@ -93,18 +93,17 @@ else if (window.attachEvent) {
 <?php
 echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 echo "  <tr>\n";
-echo "	<td align='left'><b>".$text['label-active']."</b><br><br>\n";
+echo "	<td align='left'>";
+echo "		<b>".$text['label-active']."</b>";
+echo "		<br><br>\n";
 echo "		".$text['description-active']."\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 align=\"left\"><div id=\"ajax_reponse\"></div></td>";
-echo "</tr>";
-echo "</table>";
+echo "<div id=\"ajax_reponse\"></div>";
+echo "<br><br>";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php
index 08bae68384..1263c122d9 100644
--- a/app/contacts/contact_address_edit.php
+++ b/app/contacts/contact_address_edit.php
@@ -447,6 +447,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index d981359c17..ceb91c7616 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -711,6 +711,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "</tr>\n";
 	echo "</table>\n";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php
index 3c93ece8c9..175d2c23fa 100644
--- a/app/contacts/contact_email_edit.php
+++ b/app/contacts/contact_email_edit.php
@@ -293,6 +293,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index 2fb75c1925..0c25924cd4 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -435,65 +435,15 @@ else {
 	}
 	echo "		</td>\n";
 	echo "		<td valign=\"bottom\" align='right' class=\"label\" nowrap>\n";
-	echo "			<br />\n";
 	echo "			<input name=\"type\" type=\"hidden\" value=\"csv\">\n";
+	echo "			<br />\n";
 	echo "			<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	</table>\n";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
 	require_once "resources/footer.php";
-
-/*
-[Suffix]
-[MiddleName]
-[Department]
-[JobTitle]
-[Account]
-[Anniversary]
-[AssistantsName]
-[BillingInformation]
-[Birthday]
-[Categories]
-[Children]
-[DirectoryServer]
-[EmailDisplayName]
-[Email2Address]
-[Email2DisplayName]
-[Email3Address]
-[Email3DisplayName]
-[Gender]
-[GovernmentIDNumber]
-[Hobby]
-[Initials]
-[InternetFreeBusy]
-[Keywords]
-[Language1]
-[Location]
-[ManagersName]
-[Mileage]
-[OfficeLocation]
-[OrganizationalIDNumber]
-[POBox]
-[Priority]
-[Private]
-[Profession]
-[ReferredBy]
-[Sensitivity]
-[Spouse]
-[User 1]
-[User 2]
-[User 3]
-[User 4]
-
-['Callback'];
-['CarPhone'];
-['ISDN'];
-['RadioPhone'];
-['TTYTDDPhone'];
-['Telex'];
-['AssistantsPhone'];
-*/
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php
index 902195bd37..4455d74987 100644
--- a/app/contacts/contact_note_edit.php
+++ b/app/contacts/contact_note_edit.php
@@ -198,6 +198,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index 0e3415c8fb..90748aefba 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -344,6 +344,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php
index 7a6cf253f0..db0dc9c9b9 100644
--- a/app/contacts/contact_setting_edit.php
+++ b/app/contacts/contact_setting_edit.php
@@ -330,6 +330,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php
index e63b57b5fd..ec55e11cd5 100644
--- a/app/contacts/contact_url_edit.php
+++ b/app/contacts/contact_url_edit.php
@@ -293,6 +293,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index c93aa9fad3..82c32cdb71 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -270,6 +270,7 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "<br><br>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/exec/app_languages.php b/app/exec/app_languages.php
index 7e4df9a4df..78f85958c8 100644
--- a/app/exec/app_languages.php
+++ b/app/exec/app_languages.php
@@ -26,6 +26,11 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 
+	$text['title-command']['en-us'] = "Command";
+	$text['title-command']['es-cl'] = "Comando";
+	$text['title-command']['pt-pt'] = "Comando";
+	$text['title-command']['fr-fr'] = "Commande";
+
 	$text['label-execute']['en-us'] = "Execute Command";
 	$text['label-execute']['es-cl'] = "Ejecutar Comando";
 	$text['label-execute']['pt-pt'] = "Executar Comando";
@@ -36,7 +41,7 @@
 	$text['description-execute']['pt-pt'] = "Oferece uma maneira fácil de executar comandos de sistema, PHP, e switch.";
 	$text['description-execute']['fr-fr'] = "Fournir un moyen pour executer des commandes système, PHP et freeswitch. ";
 
-	$text['label-shell']['en-us'] = "Shell command";
+	$text['label-shell']['en-us'] = "Shell";
 	$text['label-shell']['es-cl'] = "Terminal de Comandos";
 	$text['label-shell']['pt-pt'] = "Comando Shell";
 	$text['label-shell']['fr-fr'] = "Commande Shell";
@@ -46,7 +51,7 @@
 	$text['description-shell']['pt-pt'] = "Comandos do sistema.";
 	$text['description-shell']['fr-fr'] = "Commande Système";
 
-	$text['label-php']['en-us'] = "PHP command";
+	$text['label-php']['en-us'] = "PHP";
 	$text['label-php']['es-cl'] = "Comando PHP";
 	$text['label-php']['pt-pt'] = "Comandos PHP";
 	$text['label-php']['fr-fr'] = "Commande PHP";
@@ -56,7 +61,7 @@
 	$text['description-php']['pt-pt'] = "Utilize a ligação seguinte como referência para o PHP: <a href='http://php.net/manual/en/index.php' target='_blank'>PHP Manual";
 	$text['description-php']['fr-fr'] = "Utiliser le lien suivant comme référence pour le PHP: <a href='http://php.net/manual/fr/index.php' target='_blank'>Manuel PHP";
 
-	$text['label-switch']['en-us'] = "Switch Command";
+	$text['label-switch']['en-us'] = "Switch";
 	$text['label-switch']['es-cl'] = "Comando de switch";
 	$text['label-switch']['pt-pt'] = "Comando Freeswitch";
 	$text['label-switch']['fr-fr'] = "Commande CLI Freeswitch";
diff --git a/app/exec/exec.php b/app/exec/exec.php
index e5db06dde2..e92aee7f6d 100644
--- a/app/exec/exec.php
+++ b/app/exec/exec.php
@@ -48,6 +48,7 @@ else {
 
 //show the header
 	require_once "resources/header.php";
+	$document['title'] = $text['title-command'];
 
 //edit area
 	echo "	<script language=\"javascript\" type=\"text/javascript\" src=\"".PROJECT_PATH."/resources/edit_area/edit_area_full.js\"></script>\n";
@@ -94,19 +95,15 @@ else {
 	echo "	</script>";
 
 //show the header
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "<td colspan='2' align='left' nowrap=\"nowrap\"><b>".$text['label-execute']."</b></td>\n";
-	echo "</tr>\n";
-	echo "<tr>\n";
-	echo "	<td align=\"left\" colspan='2'>\n";
-	echo "		".$text['description-execute']."\n";
-	echo "	<br />\n";
-	echo "	<br />\n";
-	echo "	</td>\n";
-	echo "</tr>\n";
+	echo "<b>".$text['label-execute']."</b>\n";
+	echo "<br><br>";
+	echo $text['description-execute']."\n";
+	echo "<br><br>";
+
 
 //show the result
+	echo "<form method='post' name='frm' action=''>\n";
+	echo "<table cellpadding='0' cellspacing='0' border='0' width='100%'>\n";
 	if (count($_POST)>0) {
 		echo "	<tr>\n";
 		echo "		<td colspan='2' align=\"left\">\n";
@@ -149,15 +146,13 @@ else {
 	}
 
 //html form
-	echo "<form method='post' name='frm' action=''>\n";
-
 	if (permission_exists('exec_command_line')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 		echo "	".$text['label-shell']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<textarea name='shell_cmd' id='shell_cmd' rows='2' class='formfld' style='width: 100%;' wrap='off'>$shell_cmd</textarea\n";
+		echo "	<textarea name='shell_cmd' id='shell_cmd' rows='2' class='formfld' style='width: 100%;' wrap='off'>$shell_cmd</textarea>\n";
 		echo "	<br />\n";
 		echo "	".$text['description-shell']."\n";
 		echo "</td>\n";
@@ -169,7 +164,7 @@ else {
 		echo "	".$text['label-php']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<textarea name='php_cmd' id='php_cmd' rows='7' class='formfld' style='width: 100%;' wrap='off'>$php_cmd</textarea\n";
+		echo "	<textarea name='php_cmd' id='php_cmd' rows='7' class='formfld' style='width: 100%;' wrap='off'>$php_cmd</textarea>\n";
 		echo "	<br />\n";
 		echo "	".$text['description-php']."</a>\n";
 		echo "</td>\n";
@@ -181,7 +176,7 @@ else {
 		echo "	".$text['label-switch']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		echo "	<textarea name='switch_cmd' id='switch_cmd' rows='2' class='formfld' style='width: 100%;' wrap='off'>$switch_cmd</textarea\n";
+		echo "	<textarea name='switch_cmd' id='switch_cmd' rows='2' class='formfld' style='width: 100%;' wrap='off'>$switch_cmd</textarea>\n";
 		echo "	<br />\n";
 		echo "	".$text['description-switch']."\n";
 		echo "</td>\n";
@@ -189,12 +184,13 @@ else {
 	}
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
+	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-execute']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
-	echo "</form>";
-
 	echo "</table>";
+	echo "<br><br>";
+	echo "</form>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 32248b1faf..d0baf34a3c 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -48,7 +48,8 @@ require_once "resources/paging.php";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
-	echo "			<span class=\"title\">".$text['title']."</span><br /><br />\n";
+	echo "			<span class=\"title\">".$text['title']."</span>";
+	echo "			<br /><br />\n";
 	echo "			".$text['description']."\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
@@ -195,12 +196,6 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 	echo "</table>";
 	echo "<br><br>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 6b770da33d..6a61b10f88 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -310,7 +310,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		".$text['label-name']."\n";
 	echo "	</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
-	echo "		<input class='formfld' style='width: 60%;' type='text' name='extension_name' maxlength='255' value=\"$extension_name\" required='required'>\n";
+	echo "		<input class='formfld' type='text' name='extension_name' maxlength='255' value=\"$extension_name\" required='required'>\n";
 	echo "		<br />\n";
 	echo "		".$text['description-name']."\n";
 	echo "	</td>\n";
@@ -321,7 +321,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-extension']."\n";
 	echo "	</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
-	echo "		<input class='formfld' style='width: 60%;' type='number' name='queue_extension_number' maxlength='255' min='0' step='1' value=\"$queue_extension_number\" required='required'>\n";
+	echo "		<input class='formfld' type='text' name='queue_extension_number' maxlength='255' min='0' step='1' value=\"$queue_extension_number\" required='required'>\n";
 	echo "		<br />\n";
 	echo "		".$text['description-extension']."\n";
 	echo "	</td>\n";
@@ -375,7 +375,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "    ".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td colspan='4' class='vtable' align='left'>\n";
-	echo "    <input class='formfld' style='width: 60%;' type='text' name='dialplan_description' maxlength='255' value=\"$dialplan_description\">\n";
+	echo "    <input class='formfld' type='text' name='dialplan_description' maxlength='255' value=\"$dialplan_description\">\n";
 	echo "<br />\n";
 	echo "\n";
 	echo "</td>\n";
@@ -396,7 +396,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "    ".$text['label-agent_queue_extension']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' style='width: 60%;' type='number' name='agent_queue_extension_number' maxlength='255' min='0' step='1' value=\"$agent_queue_extension_number\">\n";
+	echo "    <input class='formfld' type='text' name='agent_queue_extension_number' maxlength='255' min='0' step='1' value=\"$agent_queue_extension_number\">\n";
 	echo "<br />\n";
 	echo $text['description-agent_queue_extension']."\n";
 	echo "</td>\n";
@@ -407,7 +407,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "    ".$text['label-agent_loginout_extension']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' style='width: 60%;' type='number' name='agent_login_logout_extension_number' maxlength='255' min='0' step='1' value=\"$agent_login_logout_extension_number\">\n";
+	echo "    <input class='formfld' type='text' name='agent_login_logout_extension_number' maxlength='255' min='0' step='1' value=\"$agent_login_logout_extension_number\">\n";
 	echo "<br />\n";
 	echo $text['description-agent_loginout_extension']."\n";
 	echo "</td>\n";
diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php
index 4afb36b102..3f1f349a1e 100644
--- a/app/fifo_list/fifo_interactive.php
+++ b/app/fifo_list/fifo_interactive.php
@@ -125,14 +125,18 @@ var record_count = 0;
 <?php
 echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 echo "	<tr>\n";
-echo "	<td align='left'><b>".$text['header-queue']."</b><br>\n";
+echo "	<td align='left'>";
+echo "		<b>".$text['header-queue']."</b>";
+echo "		<br><br>\n";
 echo "		".$text['description-queue']."\n";
 echo "	</td>\n";
 echo "	</tr>\n";
 echo "</table>\n";
+echo "<br>";
 
 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>";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php
index 24b26dcbab..04e6e56e8d 100644
--- a/app/fifo_list/fifo_list.php
+++ b/app/fifo_list/fifo_list.php
@@ -94,14 +94,17 @@ else if (window.attachEvent) {
 <?php
 echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 echo "  <tr>\n";
-echo "	<td align='left'><b>".$text['header-active_queues']."</b><br>\n";
+echo "	<td align='left'>";
+echo "		<b>".$text['header-active_queues']."</b>";
+echo "		<br><br>";
 echo "		".$text['description-active_queues']."\n";
 echo "	</td>\n";
 echo "  </tr>\n";
 echo "</table>\n";
+echo "<br>";
 
-echo "<div id=\"ajax_reponse\">\n";
-echo "</div>\n";
+echo "<div id=\"ajax_reponse\"></div>\n";
+echo "<br><br>";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php
index e67da1962d..19bef1a297 100644
--- a/app/fifo_list/fifo_list_inc.php
+++ b/app/fifo_list/fifo_list_inc.php
@@ -74,7 +74,7 @@ if ($fp) {
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<th>".$text['label-name']."</th>\n";
 	echo "<th>".$text['label-consumer_count']."</th>\n";
@@ -96,14 +96,16 @@ if ($fp) {
 			$tmp_name_array = explode('@', $name);
 			$tmp_name = $tmp_name_array[0];
 
+		$td_onclick = "onclick=\"document.location.href='fifo_interactive.php?c=".$name."';\"";
+
 		if (if_group("superadmin")) {
 			//show all fifo queues
 				echo "<tr >\n";
-				echo "<td valign='top' class='".$row_style[$c]."'><a href='fifo_interactive.php?c=".$name."'>".$tmp_name."</a></td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>".$consumer_count."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>".$caller_count."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>".$waiting_count."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>".$importance."</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick."><a href='fifo_interactive.php?c=".$name."'>".$tmp_name."</a></td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$consumer_count."</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$caller_count."</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$waiting_count."</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$importance."</td>\n";
 				echo "<td class='list_control_icon'><a href='fifo_interactive.php?c=".$name."' alt='".$text['button-view']."'>$v_link_label_view</a></td>\n";
 				echo "</tr>\n";
 		}
@@ -111,11 +113,11 @@ if ($fp) {
 			//show only the fifo queues that match the domain_name
 				if (stripos($name, $_SESSION['domain_name']) !== false) {
 					echo "<tr >\n";
-					echo "<td valign='top' class='".$row_style[$c]."'><a href='fifo_interactive.php?c=".$name."'>".$tmp_name."</a></td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$consumer_count."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$caller_count."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$waiting_count."</td>\n";
-					echo "<td valign='top' class='".$row_style[$c]."'>".$importance."</td>\n";
+					echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick."><a href='fifo_interactive.php?c=".$name."'>".$tmp_name."</a></td>\n";
+					echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$consumer_count."</td>\n";
+					echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$caller_count."</td>\n";
+					echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$waiting_count."</td>\n";
+					echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$importance."</td>\n";
 					echo "<td class='list_control_icon'><a href='fifo_interactive.php?c=".$name."' alt='".$text['button-view']."'>$v_link_label_view</a></td>\n";
 					echo "</tr>\n";
 				}
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index a8c6f8c8ff..86cb81dd1b 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -312,6 +312,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<input type='hidden' name='extension_uuid' maxlength='255' value=\"$extension_uuid\">\n";
 	}
 
+	echo "<tr>\n";
+	echo "<td colspan='2' align='right'>\n";
+	echo "	<br>";
+	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "</table>";
 	echo "<br><br>";
 	echo "</form>";
diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php
index 27ef119a68..99746830a2 100644
--- a/app/music_on_hold/app_languages.php
+++ b/app/music_on_hold/app_languages.php
@@ -26,6 +26,11 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 
+	$text['title-moh']['en-us'] = "Music on Hold";
+	$text['title-moh']['es-cl'] = "Musica en Espera";
+	$text['title-moh']['pt-pt'] = "Música em Espera";
+	$text['title-moh']['fr-fr'] = "Musique de Garde";
+
 	$text['label-moh']['en-us'] = "Music on Hold";
 	$text['label-moh']['es-cl'] = "Musica en Espera";
 	$text['label-moh']['pt-pt'] = "Música em Espera";
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index 79ae0f65f0..21e33d7879 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -242,23 +242,22 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 
 //include the header
 	require_once "resources/header.php";
+	$document['title'] = $text['title-moh'];
 
 //show the title and description
 	echo "<script language='JavaScript' type='text/javascript' src='".PROJECT_PATH."/resources/javascript/reset_file_input.js'></script>\n";
 
-	echo "<br />\n";
 	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
-	echo "			<span class=\"title\"><strong>".$text['label-moh']."</strong></span><br />\n";
+	echo "			<b>".$text['label-moh']."</b>";
+	echo "			<br /><br />\n";
 	echo "			".$text['desc-moh']."\n";
 	echo "			<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
-	echo "\n";
-	echo "<br><br>\n";
-	echo "\n";
+	echo "<br>\n";
 
 //show the upload form
 	if (permission_exists('music_on_hold_add')) {
@@ -266,13 +265,13 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 		echo "<br><br>\n";
 		echo "<form action='' method='POST' enctype='multipart/form-data' name='frmUpload' id='frmUpload' onSubmit=''>\n";
 		echo "<input name='type' type='hidden' value='moh'>\n";
-		echo "<table cellpadding='0' cellspacing='0' width='600' style='border: none;'>\n";
+		echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
 		echo "	<tr>\n";
-		echo "		<td width='100%' style='padding-right: 5px;' nowrap>\n";
-		echo "			".$text['label-file-path']."<br>\n";
-		echo "			<input name='upload_file' type='file' class='formfld fileinput' style='width: 85%; margin-right: 3px;' id='upload_file'><input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('upload_file');\">\n";
+		echo "		<td style='padding-right: 15px;' nowrap>\n";
+		echo "			".$text['label-file-path'];
+		echo "			<input name='upload_file' type='file' class='formfld fileinput' style='width: 300px; margin-right: 3px;' id='upload_file'><input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('upload_file');\">\n";
 		echo "		</td>\n";
-		echo "		<td style='padding-right: 5px;' nowrap>".$text['label-sampling']."<br>\n";
+		echo "		<td style='padding-right: 15px;' nowrap>".$text['label-sampling']."";
 		echo "			<select id='upload_sampling_rate' name='upload_sampling_rate' class='formfld' style='width: auto;'>\n";
 		echo "				<option value='8'>8 kHz</option>\n";
 		echo "				<option value='16'>16 kHz</option>\n";
@@ -280,7 +279,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 		echo "				<option value='48'>48 kHz</option>\n";
 		echo "			</select>\n";
 		echo "		</td>\n";
-		echo "		<td nowrap>".$text['label-category']."<br>\n";
+		echo "		<td nowrap>".$text['label-category']."";
 		echo "			<select id='upload_category' name='upload_category' class='formfld' style='width: auto;' onchange=\"if (this.options[this.selectedIndex].value == '_NEW_CAT_') { this.style.display='none'; document.getElementById('upload_category_new').style.display=''; document.getElementById('upload_category_return').style.display=''; document.getElementById('upload_category_new').focus(); }\">\n";
 		if (permission_exists('music_on_hold_default_add')) {
 			echo "				<option value='' style='font-style: italic;'>".$text['opt-default']."</option>\n";
@@ -315,10 +314,8 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 		echo "			</select>\n";
 		echo "			<input class='formfld' style='width: 150px; display: none;' type='text' name='upload_category_new' id='upload_category_new' maxlength='255' value=''>";
 		echo "		</td>\n";
-		echo "		<td>&nbsp;<br>\n";
-		echo "			<input id='upload_category_return' type='button' class='button' style='display: none;' value='&#9665;' onclick=\"this.style.display='none'; document.getElementById('upload_category_new').style.display='none'; document.getElementById('upload_category_new').value=''; document.getElementById('upload_category').style.display=''; document.getElementById('upload_category').selectedIndex = 0;\" title='".$text['message-click-select']."'>";
-		echo "		</td>\n";
-		echo "		<td style='padding-left: 5px;'>&nbsp;<br>\n";
+		echo "		<td><input id='upload_category_return' type='button' class='button' style='display: none; margin-left: 3px;' value='&#9665;' onclick=\"this.style.display='none'; document.getElementById('upload_category_new').style.display='none'; document.getElementById('upload_category_new').value=''; document.getElementById('upload_category').style.display=''; document.getElementById('upload_category').selectedIndex = 0;\" title='".$text['message-click-select']."'></td>\n";
+		echo "		<td style='padding-left: 15px;'>\n";
 		echo "			<input name='submit' type='submit' class='btn' id='upload' value='".$text['button-upload']."'>\n";
 		echo "		</td>\n";
 		echo "	</tr>\n";
diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php
index 6a00983b68..8b1b57cf77 100644
--- a/app/phrases/phrase_edit.php
+++ b/app/phrases/phrase_edit.php
@@ -456,6 +456,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>";
 
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php
index 787b508609..29d0fe1f13 100644
--- a/app/recordings/app_languages.php
+++ b/app/recordings/app_languages.php
@@ -41,7 +41,12 @@
 	$text['description']['pt-pt'] = "Para fazer uma gravação marque *732 ou crie um ficheiro WAV de 16bit 8khz/16khz e copie-o para a seguinte directoria e actualize a página para o ouvir. Clique em \'Filename\' para descarregá-lo ou em \'Recording Name\' para ouvir o áudio.";
 	$text['description']['fr-fr'] = "Pour créer un guide vocal, composer le *732 ou créer un fichier audio WAV 16bit 8khz/16khz Mono et ensuite le copier dans le répertoire qui suit. Rafraîchir ensuite cette page pour le voir apparaitre.";
 
-	$text['label-upload']['en-us'] = "File to upload";
+	$text['header']['en-us'] = "Upload Recording";
+	$text['header']['es-cl'] = "Subir Grabación";
+	$text['header']['pt-pt'] = "Carregar Gravações";
+	$text['header']['fr-fr'] = "Télécharger Enregistrement";
+
+	$text['label-upload']['en-us'] = "File Path";
 	$text['label-upload']['es-cl'] = "Archivo a subir";
 	$text['label-upload']['pt-pt'] = "Ficheiro a carregar";
 	$text['label-upload']['fr-fr'] = "Fichier à déposer";
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index ef722e350d..ec418d0fda 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -150,31 +150,26 @@ require_once "resources/check_auth.php";
 	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
-	echo "			<span class=\"title\"><strong>".$text['title']."</strong></span><br />\n";
+	echo "			<b>".$text['title']."</b>";
+	echo "			<br /><br />\n";
 	echo "			".stripslashes($text['description'])."\n";
+	echo "			<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>";
 	echo "<br />\n";
 
-	echo "<table border='0' width='100%' cellpadding=\"0\" cellspacing=\"0\">\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' width='50%'>\n";
-	echo "			&nbsp;";
-	echo "		</td>\n";
 	if (permission_exists('recording_upload')) {
-		echo "		<td valign=\"top\" align='right' class=\"label\" nowrap>\n";
-		echo "			<form action=\"\" method=\"POST\" enctype=\"multipart/form-data\" name=\"frmUpload\" onSubmit=\"\">\n";
-		echo "			<input name=\"type\" type=\"hidden\" value=\"rec\">\n";
-		echo "			".$text['label-upload']."\n";
-		echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" style=\"width: 260px;\" id=\"ulfile\">\n";
-		echo "			<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
-		echo "			</form>";
-		echo "		</td>\n";
+		echo "<b>".$text['header']."</b>";
+		echo "<br><br>";
+		echo "<form action=\"\" method=\"POST\" enctype=\"multipart/form-data\" name=\"frmUpload\" onSubmit=\"\">\n";
+		echo "<input name=\"type\" type=\"hidden\" value=\"rec\">\n";
+		echo "".$text['label-upload']."\n";
+		echo "<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" style=\"width: 260px;\" id=\"ulfile\">\n";
+		echo "<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
+		echo "</form>";
+		echo "<br><br>\n";
 	}
-	echo "	</tr>\n";
-	echo "</table>";
-	echo "<br><br>\n";
 
 	$sql = "select * from v_recordings ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index 4d7cc2840a..cb64aaac3a 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -281,6 +281,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //show the footer
diff --git a/app/sip_status/app_languages.php b/app/sip_status/app_languages.php
index 3b2058f7e9..5a6d95ce11 100644
--- a/app/sip_status/app_languages.php
+++ b/app/sip_status/app_languages.php
@@ -26,6 +26,16 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 
+	$text['title-sip-status']['en-us'] = "SIP Status";
+	$text['title-sip-status']['es-cl'] = "SIP Estado";
+	$text['title-sip-status']['pt-pt'] = "SIP Estado";
+	$text['title-sip-status']['fr-fr'] = "SIP État";
+
+	$text['header-sip-status']['en-us'] = "SIP Status";
+	$text['header-sip-status']['es-cl'] = "SIP Estado";
+	$text['header-sip-status']['pt-pt'] = "SIP Estado";
+	$text['header-sip-status']['fr-fr'] = "SIP État";
+
 	$text['error-event-socket']['en-us'] = "Connection to Event Socket failed.";
 	$text['error-event-socket']['es-cl'] = "Conexión a Socket de Eventos fallida.";
 	$text['error-event-socket']['pt-pt'] = "A ligação ao Event Socket falhou.";
diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index 96e3fd13ec..ea0624cd73 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -72,6 +72,7 @@ if ($_GET['a'] == "download") {
 
 //show the content
 	require_once "resources/header.php";
+	$document['title'] = $text['title-sip-status'];
 
 	$msg = $_GET["savemsg"];
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
@@ -99,7 +100,7 @@ if ($_GET['a'] == "download") {
 	$gateways = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 	unset ($prep_statement, $sql);
 
-//get the  sip profiles
+//get the sip profiles
 	$sql = "select sip_profile_name from v_sip_profiles ";
 	$sql .= "order by sip_profile_name asc ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -117,11 +118,11 @@ if ($_GET['a'] == "download") {
 		catch(Exception $e) {
 			echo $e->getMessage();
 		}
-		echo "<br />\n";
-		echo "<table width='100%' cellpadding='0' cellspacing='0' border='0' style='margin-bottom: 10px;'>\n";
+		echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 		echo "<tr>\n";
 		echo "<td width='50%'>\n";
-		echo "  <b><a href='javascript:void(0);' onclick=\"$('#sofia_status').slideToggle();\">".$text['title-sofia-status']."</a></b> \n";
+		echo "	<b>".$text['header-sip-status']."</b>";
+		echo "	<br><br>";
 		echo "</td>\n";
 		echo "<td width='50%' align='right'>\n";
 		echo "  <input type='button' class='btn' value='".$text['button-flush_memcache']."' onclick=\"document.location.href='cmd.php?cmd=api+memcache+flush';\" />\n";
@@ -131,6 +132,12 @@ if ($_GET['a'] == "download") {
 		echo "</tr>\n";
 		echo "</table>\n";
 
+		echo "<table width='100%' cellpadding='0' cellspacing='0' border='0' style='margin-bottom: 10px;'>\n";
+		echo "<tr>\n";
+		echo "<td><b><a href='javascript:void(0);' onclick=\"$('#sofia_status').slideToggle();\">".$text['title-sofia-status']."</a></b></td>\n";
+		echo "</tr>\n";
+		echo "</table>\n";
+
 		echo "<div id='sofia_status' style='margin-top: 20px; margin-bottom: 30px;'>";
 		echo "<table width='100%' cellspacing='0' border='0'>\n";
 		echo "<tr>\n";
diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 982579aa0d..50d4331750 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -26,6 +26,16 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 
+	$text['title-sys-status']['en-us'] = "System Status";
+	$text['title-sys-status']['es-cl'] = "Estado del Sistema";
+	$text['title-sys-status']['pt-pt'] = "Status do Sistema";
+	$text['title-sys-status']['fr-fr'] = "État du Système";
+
+	$text['header-sys-status']['en-us'] = "System Status";
+	$text['header-sys-status']['es-cl'] = "Estado del Sistema";
+	$text['header-sys-status']['pt-pt'] = "Status do Sistema";
+	$text['header-sys-status']['fr-fr'] = "État du Système";
+
 	$text['title-sys-info']['en-us'] = "System Information";
 	$text['title-sys-info']['es-cl'] = "Información de Sistema";
 	$text['title-sys-info']['pt-pt'] = "Informação do Sistema";
diff --git a/app/system/system.php b/app/system/system.php
index 1241067e6b..eb77d27d99 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -43,9 +43,7 @@ else {
 	$text = $language->get();
 
 require_once "resources/header.php";
-
-echo "<br />";
-echo "<br />";
+$document['title'] = $text['title-sys-status'];
 
 // OS Support
 //
@@ -70,7 +68,10 @@ echo "<br />";
 //
 
 //system information
-	echo "<table width=\"100%\" border=\"0\" cellpadding=\"7\" cellspacing=\"0\">\n";
+	echo "<b>".$text['header-sys-status']."</b>";
+	echo "<br><br>";
+
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "<tr>\n";
 	echo "	<th class='th' colspan='2' align='left'>".$text['title-sys-info']."</th>\n";
 	echo "</tr>\n";
@@ -123,11 +124,7 @@ echo "<br />";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
-
-	echo "<br />";
-	echo "<br />";
-	echo "<br />\n";
-
+	echo "<br /><br>";
 
 //memory information
 	if (permission_exists('system_view_ram')) {
@@ -154,9 +151,7 @@ echo "<br />";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				echo "</table>\n";
-				echo "<br />";
-				echo "<br />";
-				echo "<br />";
+				echo "<br /><br />";
 			}
 		}
 
@@ -183,9 +178,7 @@ echo "<br />";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				echo "</table>\n";
-				echo "<br />";
-				echo "<br />";
-				echo "<br />";
+				echo "<br /><br />";
 			}
 		}
 	}
@@ -223,9 +216,7 @@ echo "<br />";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				echo "</table>\n";
-				echo "<br />";
-				echo "<br />";
-				echo "<br />";
+				echo "<br /><br />";
 			}
 		}
 
@@ -252,9 +243,7 @@ echo "<br />";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				echo "</table>\n";
-				echo "<br />";
-				echo "<br />";
-				echo "<br />";
+				echo "<br /><br />";
 			}
 		}
 	}
@@ -319,11 +308,8 @@ echo "<br />";
 			echo "	</td>\n";
 			echo "</tr>\n";
 			echo "</table>\n";
-			echo "\n";
 		}
-		echo "<br />";
-		echo "<br />";
-		echo "<br />";
+		echo "<br /><br />";
 	}
 
 //memcache information
@@ -372,7 +358,7 @@ echo "<br />";
 		}
 
 		echo "</table>\n";
-		echo "<br /><br /><br />\n";
+		echo "<br /><br />\n";
 
 	}
 
diff --git a/app/traffic_graph/status_graph.php b/app/traffic_graph/status_graph.php
index ac9daf5847..5195248697 100644
--- a/app/traffic_graph/status_graph.php
+++ b/app/traffic_graph/status_graph.php
@@ -69,13 +69,14 @@ else {
 
 require_once "resources/header.php";
 $document['title'] = $text['title-traffic_graph'];
+
 ?>
-<table width='100%'>
+<table cellpadding='0' cellspacing='0' border='0' width='100%'>
 <tr>
-<td align='left'>
+<td align='left' valign='top'>
 	<p class="pgtitle"><b><?=$text['header-traffic_graph']?></b></p>
 </td>
-<td align='right'>
+<td align='right' valign='top'>
 	<form name="form1" action="status_graph.php" method="get" style="">
 	<?=$text['label-interface']?>:
 	<select name="interface" class="formfld" style="width:100px; z-index: -10;" onchange="document.form1.submit()">
@@ -134,6 +135,7 @@ $document['title'] = $text['title-traffic_graph'];
 		<?=$text['description-no_svg']?>
 	</object>
 </div>
+<br><br>
 
 <?php
 require_once "resources/footer.php";
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 7d05035412..eed16a9304 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -624,6 +624,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index ccc08b8f48..2be98869ce 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -219,6 +219,7 @@ else {
 		$i++;
 	}
 	echo "</table>\n";
+	echo "<br><br>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/core/apps/apps.php b/core/apps/apps.php
index 19f2d64075..e35f43e6cf 100644
--- a/core/apps/apps.php
+++ b/core/apps/apps.php
@@ -56,17 +56,10 @@ require_once "resources/paging.php";
 	}
 
 //show the content
-	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap><b>".$text['header-apps']."</b></td>\n";
-	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
-	echo "	</tr>\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$text['description-apps']."<br /><br />\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
+	echo "<b>".$text['header-apps']."</b>\n";
+	echo "<br /><br />\n";
+	echo $text['description-apps'];
+	echo "<br /><br />\n";
 
 	$c = 0;
 	$row_style["0"] = "row_style0";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index f81476a1f1..09690a6b2d 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -261,7 +261,7 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add"
 	echo "<form name='frm' id='frm' method='post' action=''>";
 	echo "<input type='hidden' name='action' id='action' value=''>";
 
-	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' valign='top' nowrap='nowrap'>";
 	echo "			<b>".$text['header-default_settings']."</b>";
@@ -439,8 +439,10 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add"
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
+
 			$previous_category = $row['default_setting_category'];
-			if ($c==0) { $c=1; } else { $c=0; }
+			$c = ($c == 0) ? 1 : 0;
+
 		} //end foreach
 		unset($sql, $result, $row_count);
 	} //end if results
@@ -468,12 +470,10 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add"
 	echo "</table>";
 	echo "<br />";
 	echo $paging_controls;
-	echo "<br /><br />";
+	echo "<br /><br /><br />";
 
 	echo "</form>";
 
-	echo "<br /><br />";
-
 	// check or uncheck all category checkboxes
 	if (sizeof($subcat_ids) > 0) {
 		echo "<script>\n";
diff --git a/core/domain_settings/domain_edit.php b/core/domain_settings/domain_edit.php
index 838da35567..0f75f37567 100644
--- a/core/domain_settings/domain_edit.php
+++ b/core/domain_settings/domain_edit.php
@@ -691,10 +691,11 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br /><br />";
+
 	echo "</form>";
 
 	if ($action == "update") {
-		echo "<br /><br />";
 		require "domain_settings.php";
 	}
 
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 5bfc09fbcc..5f273f9850 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -275,7 +275,7 @@ if (sizeof($_REQUEST) > 1) {
 	if (permission_exists('domain_setting_add')) {
 		echo 		"<a href='domain_setting_edit.php?domain_uuid=".check_str($_GET['id'])."' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
-	if (permission_exists('domain_setting_delete')) {
+	if (permission_exists('domain_setting_delete') && $result_count > 0) {
 		echo "<a href='javascript:void(0);' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('action').value = 'delete'; document.getElementById('domain_frm').submit(); }\" alt='".$text['button-delete']."'>".$v_link_label_delete."</a>";
 	}
 	echo "		</td>\n";
diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php
index 7bff00a48b..adf4c25b61 100644
--- a/core/users/group_permissions.php
+++ b/core/users/group_permissions.php
@@ -317,19 +317,23 @@ require_once "resources/require.php";
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align=\"left\" nowrap=\"nowrap\"><b>".$text['header-group_permissions'].$group_name."</b></td>\n";
-	echo "		<td width='50%' align=\"right\">\n";
-	echo "			<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'> ";
+	echo "		<td width='50%' align=\"left\" nowrap=\"nowrap\" valign='top'>";
+	echo "			<b>".$text['header-group_permissions'].$group_name."</b>";
+	echo "			<br><br>";
+	echo "		</td>\n";
+	echo "		<td width='50%' align=\"right\" valign='top'>\n";
+	echo "			<input type='button' class='btn' alt='".$text['button-back']."' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'> ";
 	echo "			<input type='button' class='btn' alt='".$text['button-copy']."' onclick='copy_group();' value='".$text['button-copy']."'>";
+	echo "			<input type='submit' class='btn' name='submit' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align=\"left\" colspan='2'>\n";
-	echo "			".$text['description-group_permissions']."<br /><br />\n";
+	echo "			".$text['description-group_permissions']."\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "</table>\n";
-	echo "<br />\n";
+	echo "<br /><br />\n";
 
 	$c = 0;
 	$row_style["0"] = "row_style0";
@@ -340,8 +344,9 @@ require_once "resources/require.php";
 			$app_name = $app['name'];
 			$description = $app['description']['en-us'];
 
-			echo "<strong>".$app_name."</strong><br />\n";
-			echo $description."<br /><br />\n";
+			echo "<b>".$app_name."</b><br />\n";
+			if ($description != '') { echo $description."<br />\n"; }
+			echo "<br>";
 
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "	<tr>\n";
@@ -363,11 +368,12 @@ require_once "resources/require.php";
 			}
 
 			echo "	<tr>\n";
-			echo "		<td colspan='3' align='right' style='padding-top: 5px;'><input type='submit' name='submit' class='btn' value='".$text['button-save']."'></td>\n";
+			echo "		<td colspan='3' align='right' style='padding-top: 15px;'><input type='submit' name='submit' class='btn' value='".$text['button-save']."'></td>\n";
 			echo "	</tr>\n";
 			echo "</table>";
 			echo "<br />\n";
 		} //end foreach
+		echo "<br>";
 		unset($sql, $result, $row_count);
 
 		echo "<script>\n";
diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php
index 0eb2dfcc00..34cf1500b2 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -69,17 +69,41 @@ else {
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td align='left'>\n";
-	echo "			<span  class=\"\" height='50'><b>".$text['header-group_members'].$group_name."</b></span>";
-	echo "		</td>\n";
-	echo "		<td align='right' nowrap='nowrap'>\n";
-	echo "			<input type='button' class='btn' name='' alt='back' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'>";
-	echo "			&nbsp;&nbsp;&nbsp;\n";
+	echo "		<td width='100%' align='left' valign='top'>\n";
+	echo "			<b>".$text['header-group_members'].$group_name."</b>";
 	echo "		</td>\n";
+	echo "		<td align='right' nowrap='nowrap' valign='middle'>\n";
+	echo "			<input type='button' class='btn' style='margin-right: 15px;' alt='".$text['button-back']."' onclick=\"window.location='groups.php'\" value='".$text['button-back']."'>";
+	echo "		</td>";
+	if (permission_exists('group_member_add')) {
+		echo "		<td align='right' nowrap='nowrap' valign='top'>\n";
+		echo "			<form method='post' action='groupmemberadd.php'>";
+		$sql = "SELECT * FROM v_users ";
+		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "order by username ";
+		$prep_statement = $db->prepare(check_sql($sql));
+		$prep_statement->execute();
+		echo "			<select name=\"user_uuid\" style='width: 200px;' class='formfld'>\n";
+		echo "				<option value=\"\"></option>\n";
+		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		foreach($result as $field) {
+			$username = $field['username'];
+			if (if_group_members($db, $group_name, $field['user_uuid']) && !in_array($field['user_uuid'], $group_users)) {
+				echo "		<option value='".$field['user_uuid']."'>".$field['username']."</option>\n";
+			}
+		}
+		echo "			</select>";
+		unset($sql, $result);
+		echo "			<input type='hidden' name='group_name' value='$group_name'>";
+		echo "			<input type='submit' class='btn' value='".$text['button-add_member']."'>";
+		echo "			</form>";
+		echo "		</td>\n";
+	}
 	echo "	</tr>\n";
 	echo "</table>\n";
+	echo "<br>";
 
 	$sql = "SELECT u.user_uuid, u.username, g.group_user_uuid FROM v_group_users as g, v_users as u ";
 	$sql .= "where g.user_uuid = u.user_uuid ";
@@ -122,42 +146,7 @@ else {
 	$strlist .= "</table>\n";
 	echo $strlist;
 
-	echo "<br>";
-
-	echo "<form method='post' action='groupmemberadd.php'>";
-	echo "<table width='250'>";
-	echo "	<tr>";
-	echo "		<td width='60%' align='right'>";
-
-	$sql = "SELECT * FROM v_users ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "order by username ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-
-	echo "<select name=\"user_uuid\" style='width: 200px;' class='formfld'>\n";
-	echo "<option value=\"\"></option>\n";
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach($result as $field) {
-		$username = $field['username'];
-		if (if_group_members($db, $group_name, $field['user_uuid']) && !in_array($field['user_uuid'], $group_users)) {
-			echo "<option value='".$field['user_uuid']."'>".$field['username']."</option>\n";
-		}
-	}
-	echo "</select>";
-	unset($sql, $result);
-
-	echo "		</td>";
-	echo "		<td align='right'>";
-	if (permission_exists('group_member_add')) {
-		echo "          <input type='hidden' name='group_name' value='$group_name'>";
-		echo "          <input type='submit' class='btn' value='".$text['button-add_member']."'>";
-	}
-	echo "      </td>";
-	echo "	</tr>";
-	echo "</table>";
 	echo "<br><br>";
-	echo "</form>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/core/users/groups.php b/core/users/groups.php
index 51b6f308c7..371d31d609 100644
--- a/core/users/groups.php
+++ b/core/users/groups.php
@@ -57,13 +57,13 @@ require_once "resources/require.php";
 	}
 
 //show the content
-	echo "<div class='' style='padding:0px;'>\n";
-	echo "<table width='100%'>";
-	echo "<td>";
-
-	echo "<table width='100%' border='0'><tr>";
-	echo "<td width='50%'><b>".$text['header-group_manager']."</b><br><br></td>";
-	echo "<td width='50%' align='right'>";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>";
+	echo "<tr>";
+	echo "<td width='50%' valign='top'>";
+	echo "	<b>".$text['header-group_manager']."</b>";
+	echo "	<br><br>";
+	echo "</td>";
+	echo "<td width='50%' align='right' valign='top'>";
 	if (permission_exists('user_view')) {
 		echo "  <input type='button' class='btn' onclick=\"window.location='index.php'\" value='".$text['header-user_manager']."'>";
 	}
@@ -71,7 +71,9 @@ require_once "resources/require.php";
 		echo "	<input type='button' class='btn' alt='".$text['button-restore']."' onclick=\"window.location='permissions_default.php'\" value='".$text['button-restore']."'>";
 	}
 	echo "</td>\n";
-	echo "</tr></table>";
+	echo "</tr>";
+	echo "</table>";
+	echo "<br>";
 
 	$sql = "SELECT * FROM v_groups ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
diff --git a/core/users/index.php b/core/users/index.php
index e2f9e8e129..f4e47a3453 100644
--- a/core/users/index.php
+++ b/core/users/index.php
@@ -43,16 +43,7 @@ else {
 	$document['title'] = $text['title-user_manager'];
 
 //show the user list
-	echo "	<table width='100%' border='0'>";
-	echo "		<tr>";
-	echo "			<td align='left' width='100%'>";
 	require_once "users.php";
-	echo "				<br />";
-	echo "				<br />";
-	echo "				<br />";
-	echo "			</td>";
-	echo "		</tr>";
-	echo "	</table>";
 
 //include the footer
 	include "resources/footer.php";
diff --git a/core/users/users.php b/core/users/users.php
index 3cf812bda3..3369c6ff41 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -46,9 +46,9 @@ $field_value = $_REQUEST["field_value"];
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<form method='post' action=''>";
 	echo "<tr>\n";
-	echo "<td align='left' width='90%' nowrap><b>".$text['header-user_manager']."</b></td>\n";
-	echo "<td align='right' nowrap='nowrap'>".$text['label-search_by'].":&nbsp;</td>";
-	echo "<td align='left'>\n";
+	echo "<td align='left' width='90%' nowrap='nowrap' valign='top'><b>".$text['header-user_manager']."</b></td>\n";
+	echo "<td align='right' nowrap='nowrap' valign='middle'>".$text['label-search_by']."&nbsp;</td>";
+	echo "<td align='left' valign='top'>\n";
 	echo "	<select name='field_name' style='width:150px' class='formfld'>\n";
 	echo "	<option value=''></option>\n";
 	if ($field_name == "username") {