From 0018e553c4a804838ef0f12b20bb9c9cfa533b8e Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 15 Feb 2015 07:59:02 +0000
Subject: [PATCH] Visual adjustments.

---
 app/acl/acl_edit.php                          | 26 ++++-------
 app/acl/acl_node_edit.php                     | 26 ++++-------
 app/acl/acl_nodes.php                         | 22 ++--------
 app/acl/acls.php                              | 22 ++--------
 app/call_block/call_block.php                 | 16 +------
 app/call_block/call_block_edit.php            | 21 +++------
 app/call_broadcast/call_broadcast.php         | 18 +-------
 app/call_broadcast/call_broadcast_edit.php    | 23 ++--------
 app/call_center/call_center_agent_status.php  | 18 +-------
 app/call_center/call_center_tier_edit.php     | 15 +------
 app/call_flows/call_flow_edit.php             | 22 +++-------
 app/call_flows/call_flows.php                 | 17 +-------
 app/calls/call_edit.php                       | 15 ++-----
 app/calls/calls.php                           | 14 +-----
 app/calls_active/calls_active.php             |  6 +--
 app/click_to_call/click_to_call.php           |  4 +-
 .../conference_session_details.php            | 17 +-------
 .../conference_sessions.php                   | 17 +-------
 app/content/rssadd.php                        | 15 ++-----
 app/content/rsssubadd.php                     | 17 ++------
 app/content/rsssubupdate.php                  | 15 ++-----
 app/content/rssupdate.php                     | 18 ++------
 app/destinations/destination_edit.php         | 24 +++--------
 app/destinations/destinations.php             | 17 +-------
 app/devices/device_key_edit.php               | 22 +++-------
 app/devices/device_line_edit.php              | 26 +++--------
 app/devices/device_setting_edit.php           | 22 +++-------
 app/devices/device_settings.php               | 17 +-------
 app/dialplan/dialplan_add.php                 | 23 +++-------
 app/dialplan/dialplan_detail_edit.php         | 21 +++------
 app/dialplan/dialplan_edit.php                |  8 ++--
 app/dialplan_inbound/dialplan_inbound_add.php | 25 +++--------
 .../dialplan_outbound_add.php                 | 25 +++--------
 app/extensions/extension_edit.php             | 20 +++------
 app/extensions/extensions.php                 | 43 ++++++-------------
 app/fifo/fifo_add.php                         | 23 +++-------
 app/fifo_list/fifo_interactive.php            | 16 ++-----
 app/fifo_list/fifo_list.php                   | 17 ++------
 app/gateways/gateway_edit.php                 | 24 +++--------
 app/hot_desking/extension_edit.php            | 15 +------
 app/hot_desking/index.php                     | 32 ++++----------
 app/ivr_menu/ivr_menu_edit.php                | 13 +++---
 app/ivr_menu/ivr_menu_option_edit.php         | 19 ++------
 app/ivr_menu/ivr_menus.php                    | 34 ++++-----------
 app/modules/module_edit.php                   | 22 +++-------
 app/modules/modules.php                       | 17 +-------
 app/recordings/recording_edit.php             | 20 +++------
 .../ring_group_destination_edit.php           | 22 +++-------
 app/ring_groups/ring_group_edit.php           | 22 +++-------
 app/ring_groups/ring_group_forward.php        | 15 +------
 app/ring_groups/ring_group_forward_edit.php   | 19 +++-----
 app/ring_groups/ring_groups.php               | 18 +-------
 app/schemas/schema_data_view.php              |  2 +-
 app/schemas/schema_edit.php                   | 21 +++------
 app/schemas/schema_field_edit.php             | 22 +++-------
 app/schemas/schema_import.php                 | 24 +++--------
 app/schemas/schema_name_value_edit.php        | 20 +++------
 app/schemas/schema_name_values.php            | 18 +-------
 app/schemas/schemas.php                       | 16 +------
 app/services/service_edit.php                 | 19 ++------
 app/settings/setting_edit.php                 | 16 ++-----
 app/sip_profiles/sip_profile_edit.php         | 20 +++------
 app/sip_profiles/sip_profile_setting_edit.php | 22 +++-------
 app/sip_profiles/sip_profiles.php             | 23 ++--------
 app/sql_query/sql_query_db.php                | 17 +-------
 app/vars/var_edit.php                         | 20 +++------
 app/vars/vars.php                             | 17 +-------
 .../voicemail_greeting_edit.php               | 22 +++-------
 app/voicemails/voicemail_message_edit.php     | 22 +++-------
 app/xml_cdr/xml_cdr.php                       |  6 +--
 app/xml_cdr/xml_cdr_extension_summary.php     | 11 ++---
 app/xml_cdr/xml_cdr_search.php                | 15 ++-----
 app/xmpp/profile_edit.php                     | 20 +++------
 core/apps/apps.php                            | 17 +-------
 core/apps/apps_edit.php                       | 20 +++------
 core/databases/database_edit.php              | 20 +++------
 core/databases/databases.php                  | 17 +-------
 .../default_settings/default_setting_edit.php | 20 +++------
 core/menu/menu.php                            | 16 +------
 core/menu/menu_edit.php                       | 20 +++------
 core/menu/menu_item_edit.php                  | 17 ++------
 core/notifications/notification_edit.php      | 21 ++-------
 core/user_settings/user_edit.php              | 12 ++----
 core/users/groupadd.php                       | 13 +++---
 core/users/groupmembers.php                   | 14 +++---
 core/users/usersupdate.php                    |  5 ++-
 resources/install.php                         |  8 ++--
 87 files changed, 359 insertions(+), 1259 deletions(-)

diff --git a/app/acl/acl_edit.php b/app/acl/acl_edit.php
index 09d76af3d4..0b3e560897 100644
--- a/app/acl/acl_edit.php
+++ b/app/acl/acl_edit.php
@@ -124,7 +124,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				return;
 
 			} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true") 
+		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
@@ -149,15 +149,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['title-acl']."</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
@@ -184,13 +177,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='acl_type'>\n";
 	echo "	<option value=''></option>\n";
-	if ($acl_type == "allow") { 
+	if ($acl_type == "allow") {
 		echo "	<option value='allow' selected='selected'>".$text['label-allow']."</option>\n";
 	}
 	else {
 		echo "	<option value='allow'>".$text['label-allow']."</option>\n";
 	}
-	if ($acl_type == "deny") { 
+	if ($acl_type == "deny") {
 		echo "	<option value='deny' selected='selected'>".$text['label-deny']."</option>\n";
 	}
 	else {
@@ -215,19 +208,16 @@ 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='acl_uuid' value='$acl_uuid'>\n";
+		echo "		<input type='hidden' name='acl_uuid' value='$acl_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/acl/acl_node_edit.php b/app/acl/acl_node_edit.php
index 4b2521073b..0f2d1001eb 100644
--- a/app/acl/acl_node_edit.php
+++ b/app/acl/acl_node_edit.php
@@ -124,7 +124,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				return;
 
 			} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true") 
+		} //if ($_POST["persistformvar"] != "true")
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //pre-populate the form
@@ -149,15 +149,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['title-acl_node']."</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
@@ -173,13 +166,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='node_type'>\n";
 	echo "	<option value=''></option>\n";
-	if ($node_type == "allow") { 
+	if ($node_type == "allow") {
 		echo "	<option value='allow' selected='selected'>".$text['label-allow']."</option>\n";
 	}
 	else {
 		echo "	<option value='allow'>".$text['label-allow']."</option>\n";
 	}
-	if ($node_type == "deny") { 
+	if ($node_type == "deny") {
 		echo "	<option value='deny' selected='selected'>".$text['label-deny']."</option>\n";
 	}
 	else {
@@ -215,19 +208,16 @@ 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='acl_node_uuid' value='$acl_node_uuid'>\n";
+		echo "		<input type='hidden' name='acl_node_uuid' value='$acl_node_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/acl/acl_nodes.php b/app/acl/acl_nodes.php
index 7f9302ad10..17f7541ab5 100644
--- a/app/acl/acl_nodes.php
+++ b/app/acl/acl_nodes.php
@@ -49,13 +49,7 @@ else {
 	require_once "resources/paging.php";
 
 //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['title-acl_nodes']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -82,9 +76,9 @@ else {
 		$rows_per_page = 10;
 		$param = "";
 		$page = $_GET['page'];
-		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); 
-		$offset = $rows_per_page * $page; 
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;
 
 	//get the list
 		$sql = "select * from v_acl_nodes ";
@@ -101,7 +95,6 @@ else {
 	$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('node_type', $text['label-node_type'], $order_by, $order);
@@ -160,13 +153,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/app/acl/acls.php b/app/acl/acls.php
index face93711a..1dd05d7003 100644
--- a/app/acl/acls.php
+++ b/app/acl/acls.php
@@ -49,13 +49,7 @@ else {
 	require_once "resources/paging.php";
 
 //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['title-acls']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -87,9 +81,9 @@ else {
 		$rows_per_page = 10;
 		$param = "";
 		$page = $_GET['page'];
-		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); 
-		$offset = $rows_per_page * $page; 
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+		list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;
 
 	//get the list
 		$sql = "select * from v_acl ";
@@ -106,7 +100,6 @@ else {
 	$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('acl_name', $text['label-acl_name'], $order_by, $order);
@@ -165,13 +158,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index a489412e2e..0890af6c80 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -51,12 +51,7 @@ require_once "resources/require.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['title-call-block']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -107,7 +102,6 @@ require_once "resources/require.php";
 	$c = 0;
 	$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('call_block_number', $text['label-number'], $order_by, $order);
@@ -178,14 +172,6 @@ require_once "resources/require.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 />";
 
 //include the footer
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index feb2b7c52a..9b9731d081 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -227,17 +227,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	}\n";
 	echo "</script>";
 
-	echo "<div align='center'>";
 	// Show last 5-10 calls first, with add button
 
-	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['label-edit-add']."</b></td>\n";
@@ -331,19 +324,16 @@ 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='call_block_uuid' value='$call_block_uuid'>\n";
+		echo "		<input type='hidden' name='call_block_uuid' value='$call_block_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div><br><br>";
-
 
 //get recent calls from the db (if not editing an existing call block record)
 	if (!isset($_REQUEST["id"])) {
@@ -437,6 +427,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "<tr>\n";
 		echo "</tr>\n";
 		echo "</table>";
+		echo "<br><br>";
 	}
 // end of Display Last 5-10 Calls
 
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index 8d97755f8b..f3f7ee9955 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -47,14 +47,7 @@ else {
 	$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'><tr>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr>\n";
 	echo "<td width='50%' nowrap='nowrap' align='left'><b>".$text['title']."</b></td>\n";
 	echo "<td width='50%' align='right'>&nbsp;</td>\n";
 	echo "</tr></table>\n";
@@ -89,7 +82,6 @@ else {
 	$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('broadcast_name', $text['label-name'], $order_by, $order);
@@ -150,14 +142,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
 
 require_once "resources/footer.php";
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index 2378cd8112..24e4dafc9b 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -238,17 +238,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //begin 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";
 	echo "<td width='30%' align='left' nowrap='nowrap'><b>".$text['label-call-broadcast']."</b></td>\n";
@@ -274,7 +265,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-
 	if (if_group("superadmin")){
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -469,16 +459,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
+	echo "			<br><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>";
 
-	echo "<br />\n";
-	echo "<br />\n";
-	echo "<br />\n";
-
 	/*
 	if ($action == "update") {
 
@@ -631,10 +619,5 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 	*/
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 require_once "resources/footer.php";
 ?>
diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php
index f966be5c95..bb523ea84d 100644
--- a/app/call_center/call_center_agent_status.php
+++ b/app/call_center/call_center_agent_status.php
@@ -128,13 +128,7 @@ else {
 	}
 
 //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_agent_status']."</b></td>\n";
 	echo "<td width='50%' align='right'>\n";
@@ -154,7 +148,6 @@ else {
 	$row_style["1"] = "row_style1";
 
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<th>".$text['label-agent']."</th>\n";
@@ -209,16 +202,9 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "</form>\n";
-	echo "<br><br>";
+
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php
index 73486aaef0..92933845e7 100644
--- a/app/call_center/call_center_tier_edit.php
+++ b/app/call_center/call_center_tier_edit.php
@@ -154,16 +154,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-call_center_tier_edit'];
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-call_center_tier_edit']."</b></td>\n";
 	echo "<td width='70%' align='right'>";
@@ -390,16 +382,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<tr>\n";
 	echo "	<td colspan='2' align='right'>\n";
 	echo "		<input type='hidden' name='call_center_tier_uuid' value='$call_center_tier_uuid'>\n";
+	echo "		<br><br>";
 	echo "		<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>";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index 53d5540b25..9163e2f6ce 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -424,15 +424,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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>";
 	if ($action == "update") {
@@ -620,20 +613,17 @@ 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='call_flow_uuid' value='$call_flow_uuid'>\n";
-		echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "		<input type='hidden' name='call_flow_uuid' value='$call_flow_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index d4351ca5ee..e1de399800 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -48,13 +48,7 @@ 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_flows']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -105,7 +99,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('call_flow_status', $text['label-status'], $order_by, $order);
@@ -172,14 +165,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 />";
 
 //include the footer
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 44bac7ca3a..c0d5fc0dcb 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -488,14 +488,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</script>\n";
 
 //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=\"center\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\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";
 	echo "<td align='left' width='30%' nowrap='nowrap'>\n";
 	echo "	<b>".$text['title']."</b>\n";
@@ -756,17 +750,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($action == "update") {
 		echo "				<input type='hidden' name='id' value='$extension_uuid'>\n";
 	}
+	echo "<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/calls/calls.php b/app/calls/calls.php
index 89cb3232b5..7a98dc09e9 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -45,14 +45,9 @@ else {
 //begin the content
 	require_once "resources/header.php";
 	require_once "resources/paging.php";
-	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>";
 
 	if ($is_included != "true") {
-		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";
 		echo "		<td align='left'><b>".$text['title']."</b><br>\n";
 		echo "			".$text['description-2']."\n";
@@ -175,12 +170,7 @@ else {
 		echo "</tr>\n";
 	}
 	echo "</table>";
-
-	echo "</table>";
-	echo "</div>";
-	echo "<br>";
-	echo "<br>";
-	echo "<br>";
+	echo "<br><br>";
 
 	if ($is_included != "true") {
 		require_once "resources/footer.php";
diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php
index ada3448feb..3124d0300c 100644
--- a/app/calls_active/calls_active.php
+++ b/app/calls_active/calls_active.php
@@ -111,9 +111,7 @@ var destination;
 <?php
 
 
-echo "<div align='center'>";
-
-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";
 echo "	<td align='left'><b>".$text['title']."</b><br>\n";
 echo "		".$text['description']."\n";
@@ -144,8 +142,6 @@ echo "	</td>";
 echo "	</tr>";
 echo "</table>";
 
-echo "</div>\n";
-
 echo "<script type=\"text/javascript\">\n";
 echo "<!--\n";
 echo "function get_transfer_cmd(uuid) {\n";
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index 806082ff89..3b7b3867de 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -244,7 +244,7 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 	echo "	<br />";
 
 	echo "<form>\n";
-	echo "<table border='0' width='100%' cellpadding='6' cellspacing='0'\n";
+	echo "<table border='0' width='100%' cellpadding='0' cellspacing='0'\n";
 	echo "<tr>\n";
 	echo "	<td class='vncellreq' width='40%'>".$text['label-src-caller-id-nam']."</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
@@ -406,10 +406,12 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 
 	echo "<tr>\n";
 	echo "	<td colspan='2' align='right'>\n";
+	echo "		<br><br>";
 	echo "		<input type=\"submit\" class='btn' value=\"".$text['button-call']."\">\n";
 	echo "	</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
+	echo "<br><br>";
 	echo "</form>";
 
 //show the footer
diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php
index 136810e291..a1d0594e65 100644
--- a/app/conference_centers/conference_session_details.php
+++ b/app/conference_centers/conference_session_details.php
@@ -73,13 +73,7 @@ else {
 	$tmp_day = date("d", $start_epoch);
 
 //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['title-conference-session-details']."</b></td>\n";
 	echo "		<td width='70%' align='right'>\n";
@@ -161,7 +155,6 @@ else {
 	$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('meeting_uuid', 'Meeting UUID', $order_by, $order);
@@ -231,14 +224,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index d16ff58f2b..289a2eca90 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -52,13 +52,7 @@ else {
 	}
 
 //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['title-conference-sessions']."</b></td>\n";
 	echo "		<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='conference_rooms.php'\" value='".$text['button-back']."'></td>\n";
@@ -115,7 +109,6 @@ else {
 	$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>".$text['label-time']."</th>\n";
@@ -203,14 +196,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/app/content/rssadd.php b/app/content/rssadd.php
index 953c65a44a..7acef7ec9b 100644
--- a/app/content/rssadd.php
+++ b/app/content/rssadd.php
@@ -133,13 +133,8 @@ if (count($_POST)>0) {
 		//--- End: Edit Area -------------------------------------------------------
 	}
 
-	echo "<div align='center'>";
-	echo "<table border='0' width='100%' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\" width='100%'>\n";
-
 	echo "<form method='post' action=''>";
-	echo "<table width='100%' cellpadding='6' cellspacing='0'>";
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 
 	echo "<tr>\n";
 	echo "<td width='30%' nowrap valign='top'><b>Content Add</b></td>\n";
@@ -332,18 +327,14 @@ if (count($_POST)>0) {
 
 	echo "	<tr>";
 	echo "		<td class='' colspan='2' align='right'>";
+	echo "			<br><br>";
 	echo "          <input type='submit' class='btn' name='submit' value='".$text['button-add-title']." $module_title'>\n";
 	echo "      </td>";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
-
 require_once "resources/footer.php";
 ?>
diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php
index 706aa4cf7e..437411407e 100644
--- a/app/content/rsssubadd.php
+++ b/app/content/rsssubadd.php
@@ -101,14 +101,8 @@ if (count($_POST)>0) {
 	require_once "resources/wysiwyg.php";
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "      <br>";
-
 	echo "<form method='post' action=''>";
-	echo "<table width='100%'>";
+	echo "<table cellpadding='0' cellspacing='0' width='100%'>";
 	echo "	<tr>";
 	echo "		<td nowrap>".$text['label-title']."</td>";
 	echo "		<td width='100%'><input type='text' class='txt' name='rss_sub_title'></td>";
@@ -159,17 +153,14 @@ if (count($_POST)>0) {
 	//echo "	</tr>";    echo "	<tr>";
 	echo "		<td colspan='2' align='right'>";
 	echo "		    <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
-	echo "          <input type='submit' name='submit' class='btn' value='".text['button-add-title']."'>";
+	echo "			<br><br>";
+	echo "          <input type='submit' name='submit' class='btn' value='".$text['button-add-title']."'>";
 	echo "      </td>";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //show the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php
index ad1503d8af..57830c83f3 100644
--- a/app/content/rsssubupdate.php
+++ b/app/content/rsssubupdate.php
@@ -138,14 +138,8 @@ else {
 	require_once "resources/wysiwyg.php";
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "      <br>";
-
 	echo "<form method='post' action=''>";
-	echo "<table width='100%'>";
+	echo "<table cellpadding='0' cellspacing='0' width='100%'>";
 	//echo "	<tr>";
 	//echo "		<td>rss_uuid</td>";
 	//echo "		<td><input type='text' name='rss_uuid' class='txt' value='$rss_uuid'></td>";
@@ -190,17 +184,14 @@ else {
 	echo "		    <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
 	echo "		    <input type='hidden' name='persistform' value='0'>";
 	echo "          <input type='hidden' name='rss_sub_uuid' value='$rss_sub_uuid'>";
+	echo "			<br><br>";
 	echo "          <input type='submit' name='submit' class='btn' value='".$text['button-update']."'>";
 	echo "		</td>";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //show the footer
   require_once "resources/footer.php";
 ?>
diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php
index 28cecff066..bf28e75a44 100644
--- a/app/content/rssupdate.php
+++ b/app/content/rssupdate.php
@@ -159,17 +159,8 @@ else {
 		//--- End: Edit Area -------------------------------------------------------
 	}
 
-	echo "<div align='center'>";
-	echo "<table border='0' width='100%' cellpadding='0' cellspacing='0'>\n";
-
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\" width='100%'>\n";
-	//echo "      <br>";
-
-
 	echo "<form method='post' action=''>";
-	echo "<table width='100%' cellpadding='6' cellspacing='0'>";
-
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 	echo "<tr>\n";
 	echo "<td width='30%' nowrap valign='top'><b>".$text['label-content-edit']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='rsslist.php'\" value='".$text['button-back']."'><br /><br /></td>\n";
@@ -370,10 +361,12 @@ else {
 	//echo "<input type=\"button\" value=\"Load\" onclick=\"ajaxLoad('rss_description', ajaxresponse);\" />";
 
 	echo "          <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
+	echo "			<br><br>";
 	echo "          <input type='submit' class='btn' name='submit' value='".$text['button-save']."'>";
 	echo "		</td>";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
 	if ($rss_optional_1 == "text/javascript") {
@@ -382,11 +375,6 @@ else {
 		echo "</script>\n";
 	}
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 
   require_once "resources/footer.php";
 ?>
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 7af62f88a0..1931a65e0c 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -503,15 +503,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-destination-add']."</b></td>\n";
@@ -795,21 +788,18 @@ 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='db_destination_number' value='$destination_number'>\n";
-		echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
-		echo "				<input type='hidden' name='destination_uuid' value='$destination_uuid'>\n";
+		echo "		<input type='hidden' name='db_destination_number' value='$destination_number'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "		<input type='hidden' name='destination_uuid' value='$destination_uuid'>\n";
 	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index 04ab88a0af..aff60cbea2 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -48,13 +48,7 @@ else {
 	$text = $language->get();
 
 //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-destinations']."</b></td>\n";
 	echo "			<form method='get' action=''>\n";
@@ -128,7 +122,6 @@ else {
 	$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('destination_type', $text['label-destination_type'], $order_by, $order);
@@ -175,14 +168,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php
index 2e6ec899b5..82b84db717 100644
--- a/app/devices/device_key_edit.php
+++ b/app/devices/device_key_edit.php
@@ -175,15 +175,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['title-device_key']."</b></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='device_edit.php?id=$device_uuid'\" value='".$text['button-back']."'></td>\n";
@@ -552,21 +545,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
+	echo "			<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='device_key_uuid' value='$device_key_uuid'>\n";
+		echo "		<input type='hidden' name='device_key_uuid' value='$device_key_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/device_line_edit.php b/app/devices/device_line_edit.php
index 946b2c5fdc..6737a7ec04 100644
--- a/app/devices/device_line_edit.php
+++ b/app/devices/device_line_edit.php
@@ -203,15 +203,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['title-device_line']."</b></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='device_edit.php?id=$device_uuid'\" value='".$text['button-back']."'></td>\n";
@@ -344,25 +337,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
+	echo "			<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='device_line_uuid' value='$device_line_uuid'>\n";
+		echo "		<input type='hidden' name='device_line_uuid' value='$device_line_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	//if ($action == "update") {
-	//	require "device_keys.php";
-	//}
-
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/device_setting_edit.php b/app/devices/device_setting_edit.php
index 48da401480..74cea51c46 100644
--- a/app/devices/device_setting_edit.php
+++ b/app/devices/device_setting_edit.php
@@ -167,15 +167,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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>";
 	if ($action == "update") {
@@ -281,21 +274,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
+	echo "			<input type='hidden' name='device_uuid' value='$device_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='device_setting_uuid' value='$device_setting_uuid'>\n";
+		echo "		<input type='hidden' name='device_setting_uuid' value='$device_setting_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-+9*
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/devices/device_settings.php b/app/devices/device_settings.php
index 08a8a026bc..3ddb4c2d83 100644
--- a/app/devices/device_settings.php
+++ b/app/devices/device_settings.php
@@ -47,13 +47,7 @@ require_once "resources/paging.php";
 	$device_uuid = check_str($_GET["id"]);
 
 //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>Device Settings</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -104,7 +98,6 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	if ($result_count > 0) {
@@ -173,14 +166,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 />";
 
 //include the footer
diff --git a/app/dialplan/dialplan_add.php b/app/dialplan/dialplan_add.php
index 1f2fd66e9c..067e532645 100644
--- a/app/dialplan/dialplan_add.php
+++ b/app/dialplan/dialplan_add.php
@@ -289,16 +289,7 @@ function type_onchange(dialplan_detail_type) {
 </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 "		<br>";
-
 echo "<form method='post' name='frm' action=''>\n";
-echo "<div align='center'>\n";
-
 echo " 	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 echo "	<tr>\n";
 echo "		<td align='left'>\n";
@@ -318,7 +309,7 @@ echo "	</tr>\n";
 echo "	</table>";
 echo "<br />\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";
 echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
@@ -627,21 +618,17 @@ echo "</tr>\n";
 echo "<tr>\n";
 echo "	<td colspan='5' align='right'>\n";
 if ($action == "update") {
-	echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+	echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 }
-echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+echo "		<br><br>";
+echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 echo "	</td>\n";
 echo "</tr>";
 
 echo "</table>";
-echo "</div>";
+echo "<br><br>";
 echo "</form>";
 
-echo "</td>\n";
-echo "</tr>";
-echo "</table>";
-echo "</div>";
-echo "<br><br>";
 
 require_once "resources/footer.php";
 
diff --git a/app/dialplan/dialplan_detail_edit.php b/app/dialplan/dialplan_detail_edit.php
index e81430502a..4ed7352ad6 100644
--- a/app/dialplan/dialplan_detail_edit.php
+++ b/app/dialplan/dialplan_detail_edit.php
@@ -212,15 +212,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-dialplan_detail'];
 
 //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=\"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";
 	echo "<td align='left' width='30%' nowrap=\"nowrap\"><span class=\"title\">".$text['header-dialplan_detail']."</span></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=".$app_uuid."';\" value='".$text['button-back']."'></td>\n";
@@ -476,18 +469,18 @@ function replace_param(obj){
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
-	echo "				<input type='hidden' name='app_uuid' value='$app_uuid'>\n";
+	echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+	echo "			<input type='hidden' name='app_uuid' value='$app_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='dialplan_detail_uuid' value='$dialplan_detail_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_detail_uuid' value='$dialplan_detail_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
-	echo "</div>\n";
+	echo "<br><br>";
 	echo "</form>";
-	echo "</div>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/dialplan/dialplan_edit.php b/app/dialplan/dialplan_edit.php
index 00d03b9ae8..205c0a50ab 100644
--- a/app/dialplan/dialplan_edit.php
+++ b/app/dialplan/dialplan_edit.php
@@ -312,7 +312,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<form method='post' name='frm' action=''>\n";
 	echo "<input type='hidden' name='app_uuid' value='".$app_uuid."'>\n";
 
-	echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n";
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"1\">\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' width='30%'>\n";
 	echo"			<span class=\"title\">".$text['title-dialplan_edit']."</span><br />\n";
@@ -332,11 +332,11 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</table>";
 	echo "<br />\n";
 
-	echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='50%' style='vertical-align: top;'>\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";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='30%'>\n";
 		echo "    ".$text['label-name']."\n";
@@ -389,7 +389,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>";
 	echo "<td width='50%' style='vertical-align: top;'>\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";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='30%'>\n";
 		echo "    ".$text['label-order']."\n";
diff --git a/app/dialplan_inbound/dialplan_inbound_add.php b/app/dialplan_inbound/dialplan_inbound_add.php
index 41d85749f2..8e5e0c533e 100644
--- a/app/dialplan_inbound/dialplan_inbound_add.php
+++ b/app/dialplan_inbound/dialplan_inbound_add.php
@@ -740,16 +740,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 <?php
 //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=\"left\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
-
-	echo " 	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+	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-dialplan-inbound-add']."</span>\n";
@@ -781,7 +773,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<br />\n";
 	echo "<br />\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";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "    ".$text['label-name']."\n";
@@ -1100,21 +1092,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<tr>\n";
 	echo "	<td colspan='5' align='right'>\n";
 	if ($action == "update" && permission_exists("inbound_route_edit")) {
-		echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "		<br><br>";
+	echo "		<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
 
 	echo "</table>";
-	echo "</div>";
-	echo "</form>";
-
-	echo "</td>\n";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
+	echo "</form>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index abb250d33f..4265c7eabd 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -576,17 +576,8 @@ function type_onchange(dialplan_detail_type) {
 
 <?php
 //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=\"left\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
-
-	echo " 	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
 	echo "			<span class=\"title\">".$text['label-outbound-routes']."</span>\n";
@@ -608,7 +599,7 @@ function type_onchange(dialplan_detail_type) {
 	echo "<br />\n";
 	echo "<br />\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";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "    ".$text['label-gateway']."\n";
@@ -999,22 +990,16 @@ function type_onchange(dialplan_detail_type) {
 	echo "<tr>\n";
 	echo "	<td colspan='5' align='right'>\n";
 	if ($action == "update") {
-		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
+	echo "		<br><br>";
 	echo "		<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "	</td>\n";
 	echo "</tr>";
 
 	echo "</table>";
-	echo "</div>";
-	echo "</form>";
-
-	echo "</td>\n";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-
 	echo "<br><br>";
+	echo "</form>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 181da5f51a..8a78a0dd85 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -846,15 +846,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "</script>";
 
-	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 "      <br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
-	echo "<div align='center'>\n";
-	echo "<table width='100%' border='0' cellpdding='6' cellspacing='0'>\n";
+	echo "<table width='100%' border='0' cellpdding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($action == "add") {
 		echo "<td width='30%' nowrap='nowrap' align='left' valign='top'><b>".$text['header-extension-add']."</b></td>\n";
@@ -1677,7 +1670,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td style='padding: 0px;' colspan='2' class='' valign='top' align='left' nowrap>\n";
 
 	echo "	<div id=\"show_advanced_box\">\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";
 	echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 	echo "		<td width=\"70%\" class=\"vtable\">\n";
@@ -1688,7 +1681,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	</div>\n";
 
 	echo "	<div id=\"show_advanced\" style=\"display:none\">\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";
 	echo "<td width=\"30%\" class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -1879,17 +1872,14 @@ 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 "			<br><br>";
 	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index 7662878213..5919310f05 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -48,27 +48,20 @@ require_once "resources/paging.php";
 	$text = $language->get();
 
 //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>";
-
-	//show the content header
-		echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
-		echo "  <tr>\n";
-		echo "	<td align='left'><b>".$text['header-extensions']."</b><br>\n";
-		echo "		".$text['description-extensions']."\n";
-		echo "	</td>\n";
-		echo "		<form method='get' action=''>\n";
-		echo "			<td width='30%' align='right'>\n";
-		echo "				<input type='text' class='txt' style='width: 150px' name='search' value='$search'>";
-		echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>";
-		echo "			</td>\n";
-		echo "		</form>\n";
-		echo "  </tr>\n";
-		echo "</table>\n";
-		echo "<br />";
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+	echo "  <tr>\n";
+	echo "	<td align='left'><b>".$text['header-extensions']."</b><br>\n";
+	echo "		".$text['description-extensions']."\n";
+	echo "	</td>\n";
+	echo "		<form method='get' action=''>\n";
+	echo "			<td width='30%' align='right'>\n";
+	echo "				<input type='text' class='txt' style='width: 150px' name='search' value='$search'>";
+	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>";
+	echo "			</td>\n";
+	echo "		</form>\n";
+	echo "  </tr>\n";
+	echo "</table>\n";
+	echo "<br />";
 
 	//get the number of extensions
 		$sql = "select count(*) as num_rows from v_extensions ";
@@ -132,7 +125,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('extension', $text['label-extension'], $order_by, $order);
@@ -196,15 +188,8 @@ 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/fifo/fifo_add.php b/app/fifo/fifo_add.php
index 185b511c96..e291529f76 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -283,12 +283,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 } //end if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class=''>\n";
-	echo "	<td align=\"left\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\n";
 	echo " 	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "	<tr>\n";
@@ -310,7 +304,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<br />\n";
 	echo "<br />\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";
 	echo "	<td class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "		".$text['label-name']."\n";
@@ -420,25 +414,20 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "</table>\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";
 	echo "	<td colspan='5' align='right'>\n";
 	if ($action == "update") {
-		echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "	<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "		<br><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>";
 
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>\n";
-	echo "</div>";
-	echo "<br><br>";
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php
index 9693dcf42e..4afb36b102 100644
--- a/app/fifo_list/fifo_interactive.php
+++ b/app/fifo_list/fifo_interactive.php
@@ -123,9 +123,7 @@ var record_count = 0;
 </script>
 
 <?php
-echo "<div align='center'>";
-
-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";
 echo "	<td align='left'><b>".$text['header-queue']."</b><br>\n";
 echo "		".$text['description-queue']."\n";
@@ -133,16 +131,8 @@ 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>";
+echo "<div id=\"ajax_reponse\"></div>\n";
+echo "<div id=\"time_stamp\" style=\"visibility:hidden\">".date('Y-m-d-s')."</div>\n";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php
index 368f73aef7..24b26dcbab 100644
--- a/app/fifo_list/fifo_list.php
+++ b/app/fifo_list/fifo_list.php
@@ -92,9 +92,7 @@ else if (window.attachEvent) {
 </script>
 
 <?php
-echo "<div align='center'>";
-
-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";
 echo "	<td align='left'><b>".$text['header-active_queues']."</b><br>\n";
 echo "		".$text['description-active_queues']."\n";
@@ -102,17 +100,8 @@ 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\">\n";
-echo "	</div>\n";
-
-echo "	</td>";
-echo "	</tr>";
-echo "</table>";
-echo "</div>";
+echo "<div id=\"ajax_reponse\">\n";
+echo "</div>\n";
 
 require_once "resources/footer.php";
 ?>
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index bd86b62d58..2763bea9de 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -369,15 +369,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "</script>";
 
-	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 "		<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";
 	echo "<td colspan='2'>\n";
 
@@ -534,7 +527,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td style='padding: 0px;' colspan='2' class='' valign='top' align='left' nowrap>\n";
 
 	echo "	<div id=\"show_advanced_box\">\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";
 	echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 	echo "		<td width=\"70%\" class=\"vtable\">\n";
@@ -545,7 +538,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	</div>\n";
 
 	echo "	<div id=\"show_advanced\" style=\"display:none\">\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";
 	echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
@@ -863,19 +856,16 @@ 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='gateway_uuid' value='$gateway_uuid'>\n";
+		echo "		<input type='hidden' name='gateway_uuid' value='$gateway_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 
diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php
index 5138e1d249..a8c6f8c8ff 100644
--- a/app/hot_desking/extension_edit.php
+++ b/app/hot_desking/extension_edit.php
@@ -225,15 +225,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "</script>";
 
-	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 "      <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";
 	echo "	<td width='30%' nowrap='nowrap' align='left' valign='top'>\n";
 	echo "		<b>".$text['header-hot_desking']."</b>\n";
@@ -320,12 +313,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 require_once "resources/footer.php";
 ?>
diff --git a/app/hot_desking/index.php b/app/hot_desking/index.php
index ab2529ad5b..53846084f8 100644
--- a/app/hot_desking/index.php
+++ b/app/hot_desking/index.php
@@ -50,21 +50,14 @@ else {
 	}
 
 //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>";
-
-	//show the content header
-		echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
-		echo "  <tr>\n";
-		echo "	<td align='left'><b>".$text['header-hot_desking']."</b><br>\n";
-		echo "		".$text['description-hot_desking']."\n";
-		echo "	</td>\n";
-		echo "  </tr>\n";
-		echo "</table>\n";
-		echo "<br />";
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
+	echo "  <tr>\n";
+	echo "	<td align='left'><b>".$text['header-hot_desking']."</b><br>\n";
+	echo "		".$text['description-hot_desking']."\n";
+	echo "	</td>\n";
+	echo "  </tr>\n";
+	echo "</table>\n";
+	echo "<br />";
 
 	//get the number of rows in v_extensions
 		$sql = "select count(*) as num_rows from v_extensions ";
@@ -112,7 +105,6 @@ else {
 		$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('extension', $text['label-extension'], $order_by, $order);
@@ -177,15 +169,7 @@ else {
 		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/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index 0ac925f2e6..67f3659ccf 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -806,7 +806,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//--- begin: show_advanced -----------------------
 		echo "	<div id=\"show_advanced_box\">\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";
 		echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 		echo "		<td width=\"70%\" class=\"vtable\">\n";
@@ -817,7 +817,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	</div>\n";
 
 		echo "	<div id=\"show_advanced\" style=\"display:none\">\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";
 		echo "<td width=\"30%\" class='vncellreq' valign='top' align='left' nowrap>\n";
@@ -945,7 +945,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//--- end: show_advanced -----------------------
 
-	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";
 	echo "<td width=\"30%\" class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-enabled']."\n";
@@ -983,13 +983,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if (strlen($ivr_menu_uuid) > 0) {
-		echo "				<input type='hidden' name='ivr_menu_uuid' value='$ivr_menu_uuid'>\n";
+		echo "		<input type='hidden' name='ivr_menu_uuid' value='$ivr_menu_uuid'>\n";
 	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
-	echo "<br>";
+	echo "<br><br>";
 
 	echo "</form>";
 
diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php
index 558c9cf189..c7fce33c84 100644
--- a/app/ivr_menu/ivr_menu_option_edit.php
+++ b/app/ivr_menu/ivr_menu_option_edit.php
@@ -180,15 +180,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		$document['title'] = $text['title-option_edit'];
 	}
 
-	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") {
@@ -338,20 +331,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "		<td colspan='2' align='right'>\n";
 	echo "			<input type='hidden' name='ivr_menu_uuid' value='$ivr_menu_uuid'>\n";
 	if ($action == "update") {
-		echo "			<input type='hidden' name='ivr_menu_option_uuid' value='$ivr_menu_option_uuid'>\n";
+		echo "		<input type='hidden' name='ivr_menu_option_uuid' value='$ivr_menu_option_uuid'>\n";
 	}
+	echo "			<br><br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 
 	echo "</table>\n";
-	echo "</div>\n";
+	echo "<br><br>";
 	echo "</form>\n";
 
-	echo "	</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
-	echo "</div>\n";
-
 require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ivr_menu/ivr_menus.php b/app/ivr_menu/ivr_menus.php
index a385c0b933..abe9dc58d4 100644
--- a/app/ivr_menu/ivr_menus.php
+++ b/app/ivr_menu/ivr_menus.php
@@ -54,22 +54,15 @@ else {
 	}
 
 //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>";
-
-	//show the content header
-		echo "<table width='100%' border='0'>\n";
-		echo "<tr>\n";
-		echo "<td width='50%' nowrap='nowrap' align='left'><b>".$text['header-ivr_menus']."</b></td>\n";
-		echo "</tr>\n";
-		echo "<tr>\n";
-		echo "<td align='left'>".$text['description-ivr_menus']."</td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-		echo "<br>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
+	echo "<tr>\n";
+	echo "<td width='50%' nowrap='nowrap' align='left'><b>".$text['header-ivr_menus']."</b></td>\n";
+	echo "</tr>\n";
+	echo "<tr>\n";
+	echo "<td align='left'>".$text['description-ivr_menus']."</td>\n";
+	echo "</tr>\n";
+	echo "</table>\n";
+	echo "<br>\n";
 
 	//get the count
 		require_once "resources/classes/database.php";
@@ -105,7 +98,6 @@ else {
 		$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('ivr_menu_name', $text['label-name'], $order_by[0]['name'], $order_by[0]['order']);
@@ -168,14 +160,6 @@ else {
 		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
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 2a3774558a..8914c32025 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -169,16 +169,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='2'>\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") {
@@ -289,19 +281,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='module_uuid' value='$module_uuid'>\n";
+		echo "		<input type='hidden' name='module_uuid' value='$module_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/modules/modules.php b/app/modules/modules.php
index 72f0339686..47e6c37f3b 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -93,13 +93,7 @@ if (strlen($_GET["a"]) > 0) {
 	}
 
 //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'><tr>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'><tr>\n";
 	echo "<td align='left' nowrap><b>".$text['header-modules']."</b></td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
@@ -111,7 +105,6 @@ if (strlen($_GET["a"]) > 0) {
 	$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";
 	$tmp_module_header = "\n";
 	$tmp_module_header .= "<tr>\n";
@@ -219,14 +212,6 @@ if (strlen($_GET["a"]) > 0) {
 	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
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index bff42254f5..88ec53e83e 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -181,16 +181,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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=\"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") {
@@ -240,18 +232,16 @@ 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='recording_uuid' value='$recording_uuid'>\n";
+		echo "		<input type='hidden' name='recording_uuid' value='$recording_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php
index 934d46c395..42d26fb97f 100644
--- a/app/ring_groups/ring_group_destination_edit.php
+++ b/app/ring_groups/ring_group_destination_edit.php
@@ -183,15 +183,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['title-ring_group_destination']."</b></td>\n";
 	echo "<td width='70%' align='right'>";
@@ -263,21 +256,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='ring_group_uuid' value='$ring_group_uuid'>\n";
+	echo "			<input type='hidden' name='ring_group_uuid' value='$ring_group_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='ring_group_destination_uuid' value='$ring_group_destination_uuid'>\n";
+		echo "		<input type='hidden' name='ring_group_destination_uuid' value='$ring_group_destination_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index d71b816ba5..0a2babb325 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -392,15 +392,8 @@ else {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['label-ring-group']."</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
@@ -741,22 +734,19 @@ else {
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
 	if (strlen($dialplan_uuid) > 0) {
-		echo "				<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
+		echo "		<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
 	if (strlen($ring_group_uuid) > 0) {
-		echo "				<input type='hidden' name='ring_group_uuid' value='$ring_group_uuid'>\n";
+		echo "		<input type='hidden' name='ring_group_uuid' value='$ring_group_uuid'>\n";
 	}
-	echo "				<input type='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 4440149692..2d149d308a 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -47,11 +47,6 @@ 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 "	<tr>\n";
@@ -129,7 +124,6 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	//echo th_order_by('ring_group_name', $text['label-name'], $order_by, $order);
@@ -176,15 +170,8 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "<br><br>";
 	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php
index ec4feeb9cf..dc427247fb 100644
--- a/app/ring_groups/ring_group_forward_edit.php
+++ b/app/ring_groups/ring_group_forward_edit.php
@@ -109,14 +109,8 @@ require_once "resources/check_auth.php";
 	}
 
 //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=\"center\">\n";
-	echo "		<br>";
-
 	echo "<form method='post' name='frm' action=''>\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";
 	echo "<td align='left' width='30%' nowrap>\n";
 	echo "	<b>".$text['header-ring-group-forward']."</b>\n";
@@ -172,18 +166,15 @@ require_once "resources/check_auth.php";
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='id' value='$ring_group_uuid'>\n";
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<input type='hidden' name='id' value='$ring_group_uuid'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //show the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index 39db66cba7..dd2f30fe30 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -47,13 +47,7 @@ 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['title']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -108,7 +102,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('ring_group_name', $text['label-name'], $order_by, $order);
@@ -176,15 +169,8 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "<br><br>";
 	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/schemas/schema_data_view.php b/app/schemas/schema_data_view.php
index f69123245b..858c52e69e 100644
--- a/app/schemas/schema_data_view.php
+++ b/app/schemas/schema_data_view.php
@@ -248,7 +248,7 @@ if (strlen($_GET["id"]) > 0) {
 
 //set the title and description of the table
 	echo "<br />\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";
 	echo "	<td align='left' valign='top'><strong>$schema_label</strong><br>\n";
 	echo "		$schema_description\n";
diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php
index edb7ccb6d4..09629da152 100644
--- a/app/schemas/schema_edit.php
+++ b/app/schemas/schema_edit.php
@@ -176,14 +176,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-schema'];
 
 //show the content
-	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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-schema']."</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
@@ -303,24 +297,21 @@ 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='schema_uuid' value='$schema_uuid'>\n";
+		echo "		<input type='hidden' name='schema_uuid' value='$schema_uuid'>\n";
 	}
-	echo "				<input type='hidden' name='schema_captcha' value='$schema_captcha'>\n";
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<input type='hidden' name='schema_captcha' value='$schema_captcha'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
-	echo "</div>";
+	echo "<br><br>";
 	echo "</form>";
 
 	if ($action == "update") {
 		require "schema_fields.php";
 	}
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-
 
 //show the footer
 	require_once "resources/footer.php";
diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php
index 79dd7feeac..e60486a5d6 100644
--- a/app/schemas/schema_field_edit.php
+++ b/app/schemas/schema_field_edit.php
@@ -202,15 +202,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-field'];
 
 //begin 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";
 	echo "<td align='left' width='30%' nowrap=\"nowrap\"><b>".$text['header-field']."</b></td>\n";
 	echo "<td width='70%' align='right'>";
@@ -498,14 +491,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='schema_uuid' value='$schema_uuid'>\n";
+	echo "			<input type='hidden' name='schema_uuid' value='$schema_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='schema_field_uuid' value='$schema_field_uuid'>\n";
+		echo "		<input type='hidden' name='schema_field_uuid' value='$schema_field_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
 	if ($action == "update") {
@@ -514,11 +509,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		}
 	}
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //show the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_import.php b/app/schemas/schema_import.php
index 1308f4e4de..a9882a54cf 100644
--- a/app/schemas/schema_import.php
+++ b/app/schemas/schema_import.php
@@ -209,8 +209,7 @@ if (count($_POST)>0) {
 				require_once "resources/header.php";
 				$document['title'] = $text['title-import_results'];
 
-			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";
 			echo "<td width='30%' nowrap='nowrap' align='left' valign='top'><b>".$text['header-import_results']."</b></td>\n";
 			echo "<td width='70%' align='right' valign='top'>\n";
@@ -292,7 +291,7 @@ if (count($_POST)>0) {
 			echo "		</td>\n";
 			echo "	</tr>";
 			echo "	</table>";
-			echo "</div>\n";
+			echo "<br><br>";
 
 			//show the footer
 				require_once "resources/footer.php";
@@ -305,8 +304,7 @@ if (count($_POST)>0) {
 	$document['title'] = $text['title-import'];
 
 //show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='30%' nowrap='nowrap' align='left' valign='top'><b>".$text['header-import']."</b></td>\n";
 	echo "<td width='70%' align='right' valign='top'>\n";
@@ -315,14 +313,8 @@ if (count($_POST)>0) {
 	echo "</tr>\n";
 	echo "</table>\n";
 
-	echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\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";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -365,16 +357,12 @@ if (count($_POST)>0) {
 
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
+	echo "			<br><br>";
 	echo "			<input type='submit' name='import' class='btn' value='".$text['button-import']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
-
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
+	echo "<br><br>";
 	echo "</form>";
 
 require_once "resources/footer.php";
diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php
index f575250a87..d4d9fb0e45 100644
--- a/app/schemas/schema_name_value_edit.php
+++ b/app/schemas/schema_name_value_edit.php
@@ -159,15 +159,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-name_value'];
 
 //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") {
@@ -213,18 +206,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "			<input type='hidden' name='schema_uuid' value='$schema_uuid'>\n";
 	echo "			<input type='hidden' name='schema_field_uuid' value='$schema_field_uuid'>\n";
 	if ($action == "update") {
-		echo "			<input type='hidden' name='schema_name_value_uuid' value='$schema_name_value_uuid'>\n";
+		echo "		<input type='hidden' name='schema_name_value_uuid' value='$schema_name_value_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/schemas/schema_name_values.php b/app/schemas/schema_name_values.php
index 97037e44bc..0ca9d2799b 100644
--- a/app/schemas/schema_name_values.php
+++ b/app/schemas/schema_name_values.php
@@ -41,13 +41,7 @@ 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-name_values']."</b></td>\n";
 	echo "<td width='50%' align=\"right\">&nbsp;</td>\n";
@@ -90,7 +84,6 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo th_order_by('data_types_name', $text['label-name_value_name'], $order_by, $order);
@@ -131,15 +124,8 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
+	echo "<br><br>";
 	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/schemas/schemas.php b/app/schemas/schemas.php
index 6e601f189e..a93fea8933 100644
--- a/app/schemas/schemas.php
+++ b/app/schemas/schemas.php
@@ -48,13 +48,8 @@ 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-schemas']."</b></td>\n";
 	echo "<td width='50%' align='right'>&nbsp;</td>\n";
@@ -96,7 +91,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('schema_label', $text['label-label'], $order_by, $order);
@@ -170,14 +164,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
diff --git a/app/services/service_edit.php b/app/services/service_edit.php
index a0739fe9f6..ec0497230c 100644
--- a/app/services/service_edit.php
+++ b/app/services/service_edit.php
@@ -165,15 +165,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //begin 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><b>".$text['title']."</b></td>\n";
@@ -281,19 +274,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='service_uuid' value='$service_uuid'>\n";
+		echo "		<input type='hidden' name='service_uuid' value='$service_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<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>";
-
 //show the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/settings/setting_edit.php b/app/settings/setting_edit.php
index 17e72c1738..72eeb372a7 100644
--- a/app/settings/setting_edit.php
+++ b/app/settings/setting_edit.php
@@ -212,15 +212,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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=\"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") {
@@ -482,18 +475,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if (permission_exists('setting_edit')) {
 		echo "	<tr>\n";
 		echo "		<td colspan='2' align='right'>\n";
+		echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //show the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php
index 78e40b2de2..d468340d9e 100644
--- a/app/sip_profiles/sip_profile_edit.php
+++ b/app/sip_profiles/sip_profile_edit.php
@@ -183,15 +183,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-sip_profile'];
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-sip_profile']."</b></td>\n";
 	echo "<td width='70%' align='right'>\n";
@@ -241,23 +234,20 @@ 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='sip_profile_uuid' value='$sip_profile_uuid'>\n";
+		echo "		<input type='hidden' name='sip_profile_uuid' value='$sip_profile_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
 	if ($action == "update") {
 		require "sip_profile_settings.php";
 	}
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
diff --git a/app/sip_profiles/sip_profile_setting_edit.php b/app/sip_profiles/sip_profile_setting_edit.php
index 991dc43380..f7c897f5c0 100644
--- a/app/sip_profiles/sip_profile_setting_edit.php
+++ b/app/sip_profiles/sip_profile_setting_edit.php
@@ -170,15 +170,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	$document['title'] = $text['title-setting'];
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-setting']."</b></td>\n";
 	echo "<td width='70%' align='right'>";
@@ -250,21 +243,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='sip_profile_uuid' value='$sip_profile_uuid'>\n";
+	echo "			<input type='hidden' name='sip_profile_uuid' value='$sip_profile_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='sip_profile_setting_uuid' value='$sip_profile_setting_uuid'>\n";
+		echo "		<input type='hidden' name='sip_profile_setting_uuid' value='$sip_profile_setting_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 81c3cb4a17..b48151ae55 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -48,13 +48,7 @@ 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 align='left' width='33%' nowrap='nowrap'><b>".$text['header-sip_profiles']."</b></td>\n";
 	echo "		<td width='33%' align='right'>&nbsp;</td>\n";
@@ -107,7 +101,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('sip_profile_name', $text['label-name'], $order_by, $order);
@@ -152,9 +145,8 @@ require_once "resources/paging.php";
 	echo "<td colspan='4' align='left'>\n";
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='25%' nowrap>&nbsp;</td>\n";
-	echo "		<td width='25%' nowrap>&nbsp;</td>\n";
-	echo "		<td width='25%' align='center' nowrap>$paging_controls</td>\n";
+	echo "		<td width='33%' nowrap>&nbsp;</td>\n";
+	echo "		<td width='34%' align='center' nowrap>$paging_controls</td>\n";
 	echo "		<td class='list_control_icons'>";
 	if (permission_exists('sip_profile_add')) {
 		echo 		"<a href='sip_profile_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
@@ -166,15 +158,8 @@ require_once "resources/paging.php";
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
+	echo "<br><br>";
 
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/app/sql_query/sql_query_db.php b/app/sql_query/sql_query_db.php
index 3cf284e4de..d952e4b79d 100644
--- a/app/sql_query/sql_query_db.php
+++ b/app/sql_query/sql_query_db.php
@@ -48,13 +48,8 @@ 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-databases']."</b></td>\n";
 	echo "		<td width='50%' align=\"right\">";
@@ -107,9 +102,7 @@ require_once "resources/paging.php";
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-
 	echo "<tr>\n";
 	echo th_order_by('database_type', $text['label-type'], $order_by, $order);
 	echo th_order_by('database_host', $text['label-host'], $order_by, $order);
@@ -136,14 +129,6 @@ require_once "resources/paging.php";
 	} //end if results
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
 
 //include the footer
diff --git a/app/vars/var_edit.php b/app/vars/var_edit.php
index 73751a99e0..8d2af40312 100644
--- a/app/vars/var_edit.php
+++ b/app/vars/var_edit.php
@@ -180,15 +180,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 //show contents
-	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") {
@@ -299,9 +292,10 @@ 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='var_uuid' value='$var_uuid'>\n";
+		echo "		<input type='hidden' name='var_uuid' value='$var_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 
@@ -366,13 +360,9 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include header
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/vars/vars.php b/app/vars/vars.php
index 2ed9401ff4..d0c60e9687 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -66,13 +66,7 @@ else {
 	$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\" cellpadding=\"6\" cellspacing=\"0\">\n";
+	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "  <tr>\n";
 	echo "	<td align='left'><b>".$text['header-variables']."</b><br>\n";
 	echo "		".$text['description-variables']."\n";
@@ -97,7 +91,6 @@ else {
 	$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";
 
 	$tmp_var_header = '';
@@ -194,14 +187,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
 
 //include the footer
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 729d65a846..d52c3b2298 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -167,15 +167,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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=\"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") {
@@ -214,20 +207,17 @@ 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='voicemail_greeting_uuid' value='$voicemail_greeting_uuid'>\n";
+		echo "		<input type='hidden' name='voicemail_greeting_uuid' value='$voicemail_greeting_uuid'>\n";
 	}
-	echo "				<input type='hidden' name='voicemail_id' value='$voicemail_id'>\n";
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<input type='hidden' name='voicemail_id' value='$voicemail_id'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/voicemails/voicemail_message_edit.php b/app/voicemails/voicemail_message_edit.php
index 0df1de7880..7cc1941b54 100644
--- a/app/voicemails/voicemail_message_edit.php
+++ b/app/voicemails/voicemail_message_edit.php
@@ -180,15 +180,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>Voicemail Messages</b></td>\n";
 	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='voicemail_edit.php?id=$voicemail_uuid'\" value='Back'></td>\n";
@@ -272,21 +265,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='right'>\n";
-	echo "				<input type='hidden' name='voicemail_uuid' value='$voicemail_uuid'>\n";
+	echo "			<input type='hidden' name='voicemail_uuid' value='$voicemail_uuid'>\n";
 	if ($action == "update") {
-		echo "				<input type='hidden' name='voicemail_message_uuid' value='$voicemail_message_uuid'>\n";
+		echo "		<input type='hidden' name='voicemail_message_uuid' value='$voicemail_message_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='Save'>\n";
+	echo "			<br><br>";
+	echo "			<input type='submit' name='submit' class='btn' value='Save'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 4cb8fe099f..766d378375 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -162,7 +162,7 @@ else {
 			echo "<tr>\n";
 			echo "<td width='33%' style='vertical-align: top;'>\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";
 				echo "		<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 				echo "			".$text['label-direction']."\n";
@@ -253,7 +253,7 @@ else {
 					$style['caller_id_number'] = 'display: none;';
 				}
 
-				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";
 				echo "		<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 				echo "			".$text['label-source']."\n";
@@ -292,7 +292,7 @@ else {
 			echo "</td>";
 			echo "<td width='34%' style='vertical-align: top;'>\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";
 				echo "		<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 				echo "			".$text['label-start_range']."\n";
diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index 25bf93d39a..7c6fff4210 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -158,7 +158,6 @@ require_once "resources/require.php";
 	unset ($sql, $prep_statement, $result, $row_count);
 
 //page title and description
-	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' width='50%' nowrap='nowrap' style='vertical-align: top;'>\n";
@@ -177,7 +176,7 @@ require_once "resources/require.php";
 		echo "	<tr>\n";
 		echo "		<td width='25%' style='vertical-align: top;'>\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";
 		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 		echo "						".$text['label-start_date_time']."\n";
@@ -191,7 +190,7 @@ require_once "resources/require.php";
 		echo "		</td>";
 		echo "		<td width='25%' style='vertical-align: top;'>\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";
 		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 		echo "						".$text['label-end_date_time']."\n";
@@ -205,7 +204,7 @@ require_once "resources/require.php";
 		echo "		</td>";
 		echo "		<td width='25%' style='vertical-align: top;'>\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";
 		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
 		echo "						".$text['label-include_internal']."\n";
@@ -221,7 +220,7 @@ require_once "resources/require.php";
 
 		echo "		</td>";
         echo "          <td width='25%' style='vertical-align: top;'>\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";
         echo "                                  <td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
         echo "                                          ".$text['label-preset']."\n";
@@ -311,8 +310,6 @@ require_once "resources/require.php";
 	}
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
 	echo "<br><br>";
 
 //show the footer
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index efd993ab29..8057953517 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -54,13 +54,9 @@ echo "		}";
 echo "	}";
 echo "</script>";
 
-echo "<div align='center'>";
 echo "<form method='post' action='xml_cdr.php'>\n";
-echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-echo "	<tr class='border'>\n";
-echo "		<td align=\"left\">\n";
 
-echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
+echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 echo "	<tr>\n";
 echo "		<td width='30%' nowrap valign='top'><b>Advanced Search</b></td>\n";
 echo "		<td width='70%' align='right' valign='top'>";
@@ -75,7 +71,7 @@ echo "<table cellpadding='0' cellspacing='0' border='0' width='100%'>\n";
 echo "	<tr>\n";
 echo "		<td width='50%' style='vertical-align: top;'>\n";
 
-echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
+echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 echo "	<tr>\n";
 echo "		<td width='30%' class='vncell' valign='top' nowrap='nowrap'>\n";
 echo "			".$text['label-direction']."\n";
@@ -169,7 +165,7 @@ echo "</table>";
 echo "		</td>";
 echo "		<td width='50%' style='vertical-align: top;'>\n";
 
-echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
+echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 echo "	<tr>";
 echo "		<td width='30%' class='vncell'>".$text['label-billsec']."</td>";
 echo "		<td width='70%' class='vtable'><input type='text' class='formfld' name='billsec' value='$billsec'></td>";
@@ -214,12 +210,9 @@ echo "</table>";
 echo "		</td>";
 echo "	</tr>";
 echo "</table>";
+echo "<br><br>";
 
-echo "		</td>";
-echo "	</tr>";
-echo "</table>";
 echo "</form>";
-echo "</div>";
 
 require_once "resources/footer.php";
 
diff --git a/app/xmpp/profile_edit.php b/app/xmpp/profile_edit.php
index 53562fec4f..6cbff12c84 100644
--- a/app/xmpp/profile_edit.php
+++ b/app/xmpp/profile_edit.php
@@ -12,15 +12,8 @@ function show_advanced_config() {
 }
 </script>
 
-<div align='center'>
-<table width='100%' border='0' cellpadding='0' cellspacing='2'>
-<tr class='border'>
-<td align=\"left\">
-	<br>
 	<form method='post' name='ifrm' action=''>
-
-	<div align='center'>
-	<table width='100%'  border='0' cellpadding='6' cellspacing='0'>
+	<table width='100%' border='0' cellpadding='0' cellspacing='0'>
 	<tr>
 		<td colspan='2'>
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -274,14 +267,11 @@ function show_advanced_config() {
 	</tr>
 	<tr>
 		<td colspan='2' align='right'>
-				<input type='hidden' name='profile_id' value='<?php echo $profile['xmpp_profile_uuid']; ?>'>
-				<input type='submit' name='submit' class='btn' value='<?php echo $text['button-save']?>'>
+			<input type='hidden' name='profile_id' value='<?php echo $profile['xmpp_profile_uuid']; ?>'>
+			<br><br>
+			<input type='submit' name='submit' class='btn' value='<?php echo $text['button-save']?>'>
 		</td>
 	</tr>
 	</table>
+	<br><br>
 	</form>
-
-</td>
-</tr>
-</table>
-</div>
diff --git a/core/apps/apps.php b/core/apps/apps.php
index bf0ec233ef..19f2d64075 100644
--- a/core/apps/apps.php
+++ b/core/apps/apps.php
@@ -56,13 +56,7 @@ require_once "resources/paging.php";
 	}
 
 //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><b>".$text['header-apps']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -78,7 +72,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>".$text['label-name']."</th>\n";
@@ -144,14 +137,6 @@ require_once "resources/paging.php";
 	*/
 	echo "</tr>";
 	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-	echo "<br /><br />";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br /><br />";
 
 //include the footer
diff --git a/core/apps/apps_edit.php b/core/apps/apps_edit.php
index 5ef172eba5..c6f79f873e 100644
--- a/core/apps/apps_edit.php
+++ b/core/apps/apps_edit.php
@@ -138,15 +138,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";
 	echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-app-edit']."</b></td>\n";
 	echo "<td width='70%' align='right'>";
@@ -208,19 +201,16 @@ 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='app_uuid' value='$app_uuid'>\n";
+		echo "		<input type='hidden' name='app_uuid' value='$app_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/databases/database_edit.php b/core/databases/database_edit.php
index d248c51028..a7a5fb2291 100644
--- a/core/databases/database_edit.php
+++ b/core/databases/database_edit.php
@@ -207,15 +207,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='3' 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-database-add']."</b></td>\n";
@@ -393,19 +386,16 @@ 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='database_uuid' value='$database_uuid'>\n";
+		echo "		<input type='hidden' name='database_uuid' value='$database_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 3fe5dadb73..7b20efef17 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -48,13 +48,7 @@ else {
 	$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-databases']."</b></td>\n";
 	echo "		<td width='50%' align=\"right\">&nbsp;</td>\n";
@@ -103,7 +97,6 @@ else {
 	$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";
@@ -157,14 +150,6 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
 	echo "<br><br>";
 
 //include the footer
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index e426dfc469..2f583e7c05 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -173,15 +173,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-default_setting-add']."</b></td>\n";
@@ -544,19 +537,16 @@ 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='default_setting_uuid' value='".$default_setting_uuid."'>\n";
+		echo "		<input type='hidden' name='default_setting_uuid' value='".$default_setting_uuid."'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 	if ($_REQUEST["id"] == '' && $_REQUEST["default_setting_category"] != '') {
 		echo "<script>document.getElementById('default_setting_subcategory').focus();</script>";
 	}
diff --git a/core/menu/menu.php b/core/menu/menu.php
index 0f8c40c1dc..fa3ccceaec 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -48,13 +48,7 @@ else {
 	$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-menus']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
@@ -102,7 +96,6 @@ else {
 	$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('menu_name', $text['label-name'], $order_by, $order);
@@ -145,15 +138,8 @@ else {
 	echo "</tr>\n";
 
 	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
 	echo "<br><br>";
 
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 8c9b1a6a06..ef22fda4af 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -162,15 +162,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-menu-add']."</b></td>\n";
@@ -236,19 +229,16 @@ 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='menu_uuid' value='$menu_uuid'>\n";
+		echo "		<input type='hidden' name='menu_uuid' value='$menu_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
+	echo "			<br><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>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div><br><br>";
-
 //show the menu items
 	require_once "core/menu/menu_item_list.php";
 
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index 6a64488b70..5056f91a60 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -318,14 +318,8 @@ else {
 		$document['title'] = $text['title-menu_item-add'];
 	}
 
-	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 "		<br>";
-
 	echo "<form method='post' action=''>";
-	echo "<table width='100%' cellpadding='6' cellspacing='0'>";
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 	echo "<tr>\n";
 	echo "<td width='30%' align='left' valign='top' nowrap><b>";
 	if ($action == "update") {
@@ -486,10 +480,11 @@ else {
 		echo "			</td>\n";
 		echo "			<td align='right'>";
 		if ($action == "update") {
-			echo "				<input type='hidden' name='menu_item_uuid' value='$menu_item_uuid'>";
+			echo "			<input type='hidden' name='menu_item_uuid' value='$menu_item_uuid'>";
 		}
 		echo "				<input type='hidden' name='menu_uuid' value='$menu_uuid'>";
 		echo "				<input type='hidden' name='menu_item_uuid' value='$menu_item_uuid'>";
+		echo "				<br><br>";
 		echo "				<input type='submit' class='btn' name='submit' value='".$text['button-save']."'>\n";
 		echo "			</td>";
 		echo "			</tr>";
@@ -498,13 +493,9 @@ else {
 		echo "	</tr>";
 	}
 	echo "</table>";
+	echo "<br><br>";
 	echo "</form>";
 
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
 //include the footer
   require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php
index ba434bdc92..beca464ed4 100644
--- a/core/notifications/notification_edit.php
+++ b/core/notifications/notification_edit.php
@@ -320,15 +320,8 @@ require_once "resources/header.php";
 $document['title'] = $text['title-notifications'];
 
 // 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 "<form method='post' name='frm' action=''>\n";
-
-	echo "<table cellpadding='6' cellspacing='0' width='100%' border='0'>\n";
+	echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' nowrap='nowrap'><b>".$text['header-notifications']."</b><br><br></td>\n";
 	echo "		<td align='right'>";
@@ -358,7 +351,7 @@ $document['title'] = $text['title-notifications'];
 	echo "</table>\n";
 
 	echo "<div id='notification_channels' ".(($setting["project_notifications"] != 'true') ? "style='display: none;'" : null).">\n";
-		echo "<table cellpadding='6' cellspacing='0' width='100%' border='0'>\n";
+		echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 
 		echo "	<tr>\n";
 		echo "		<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
@@ -415,7 +408,7 @@ $document['title'] = $text['title-notifications'];
 		echo "</table>\n";
 	echo "</div>\n";
 
-	echo "<table cellpadding='6' cellspacing='0' width='100%' border='0'>\n";
+	echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
 	echo 			$text['label-project_notification_method']."\n";
@@ -447,7 +440,7 @@ $document['title'] = $text['title-notifications'];
 	echo "	</tr>\n";
 	echo "</table>\n";
 
-	echo "<table cellpadding='6' cellspacing='0' width='100%' border='0'>\n";
+	echo "<table cellpadding='0' cellspacing='0' width='100%' border='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='right'>\n";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
@@ -458,12 +451,6 @@ $document['title'] = $text['title-notifications'];
 
 	echo "</form>\n";
 
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br /><br />";
-
 // include the footer
 	require_once "resources/footer.php";
 ?>
\ No newline at end of file
diff --git a/core/user_settings/user_edit.php b/core/user_settings/user_edit.php
index 0f26c85cd9..fc8b2a6c09 100644
--- a/core/user_settings/user_edit.php
+++ b/core/user_settings/user_edit.php
@@ -283,13 +283,9 @@ else {
 //show the content
 	$table_width ='width="100%"';
 	echo "<form method='post' action=''>";
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr>\n";
-	echo "<td>\n";
 
-	echo "<table $table_width cellpadding='3' cellspacing='0' border='0'>";
-	echo "<td align='left' width='90%' nowrap><b>".$text['title']."</b></td>\n";
+	echo "<table $table_width cellpadding='0' cellspacing='0' border='0'>";
+	echo "<td align='left' width='100%' nowrap><b>".$text['title']."</b></td>\n";
 	echo "<td nowrap='nowrap'>\n";
 	echo "	<input type='button' class='btn' onclick=\"window.location='".$_SESSION['login']['destination']['url']."'\" value='".$text['button-back']."'>";
 	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
@@ -304,7 +300,7 @@ else {
 
 	echo "<br />\n";
 
-	echo "<table $table_width cellpadding='6' cellspacing='0' border='0'>";
+	echo "<table $table_width cellpadding='0' cellspacing='0' border='0'>";
 	echo "<tr>\n";
 	echo "	<th class='th' colspan='2' align='left'>".$text['table-title']."</th>\n";
 	echo "</tr>\n";
@@ -329,7 +325,7 @@ else {
 	echo "<br>";
 	echo "<br>";
 
-	echo "<table $table_width cellpadding='6' cellspacing='0'>";
+	echo "<table $table_width cellpadding='0' cellspacing='0'>";
 	echo "	<tr>\n";
 	echo "	<th class='th' colspan='2' align='left'>".$text['table2-title']."</th>\n";
 	echo "	</tr>\n";
diff --git a/core/users/groupadd.php b/core/users/groupadd.php
index 267b8ad971..2b68399acf 100644
--- a/core/users/groupadd.php
+++ b/core/users/groupadd.php
@@ -80,9 +80,7 @@ require_once "resources/require.php";
 	$document['title'] = $text['title-group_add'];
 
 //show the content
-	echo "<div align='center'>";
-
-	echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
 	echo "			<b>".$text['header-group_add']."</b>\n";
@@ -98,7 +96,7 @@ require_once "resources/require.php";
 	echo "<br>";
 
 	echo "<form name='login' METHOD=\"POST\" action=\"groupadd.php\">\n";
-	echo "<table width='100%' cellpadding='6' cellspacing='0'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<td width='30%' class='vncellreq'>\n";
 	echo $text['label-group_name']."\n";
@@ -122,15 +120,14 @@ require_once "resources/require.php";
 	echo "</td>\n";
 	echo "<td align=\"right\">\n";
 	echo "  <input type=\"hidden\" name=\"path\" value=\"$path\">\n";
+	echo "	<br><br>";
 	echo "  <input type=\"submit\" class='btn' value=\"".$text['button-save']."\">\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	echo "</table>\n";
-	echo "</form>";
-	echo "</div>";
 
+	echo "</table>\n";
 	echo "<br><br>";
-	echo "<br><br>";
+	echo "</form>";
 
 //include the footer
 	include "resources/footer.php";
diff --git a/core/users/groupmembers.php b/core/users/groupmembers.php
index 5f0821457c..0eb2dfcc00 100644
--- a/core/users/groupmembers.php
+++ b/core/users/groupmembers.php
@@ -69,9 +69,7 @@ else {
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
 
-	echo "<div align='center'>\n";
-
-	echo "<table width='100%' cellpadding='6' cellspacing='1'>\n";
+	echo "<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left'>\n";
 	echo "			<span  class=\"\" height='50'><b>".$text['header-group_members'].$group_name."</b></span>";
@@ -126,9 +124,8 @@ else {
 
 	echo "<br>";
 
-	echo "  <div align='center'>";
-	echo "  <form method='post' action='groupmemberadd.php'>";
-	echo "  <table width='250'>";
+	echo "<form method='post' action='groupmemberadd.php'>";
+	echo "<table width='250'>";
 	echo "	<tr>";
 	echo "		<td width='60%' align='right'>";
 
@@ -158,10 +155,9 @@ else {
 	}
 	echo "      </td>";
 	echo "	</tr>";
-	echo "  </table>";
-	echo "  </form>";
-	echo "  </div>";
+	echo "</table>";
 	echo "<br><br>";
+	echo "</form>";
 
 //include the footer
 	require_once "resources/footer.php";
diff --git a/core/users/usersupdate.php b/core/users/usersupdate.php
index c7d1ac601a..c7187aab7e 100644
--- a/core/users/usersupdate.php
+++ b/core/users/usersupdate.php
@@ -522,7 +522,7 @@ else {
 	echo "<br>";
 	echo "<br>";
 
-	echo "<table $table_width cellpadding='6' cellspacing='0'>";
+	echo "<table $table_width cellpadding='0' cellspacing='0'>";
 	echo "	<tr>\n";
 	echo "	<th class='th' colspan='2' align='left'>".$text['label-additional_info']."</th>\n";
 	echo "	</tr>\n";
@@ -715,11 +715,12 @@ else {
 	echo "		<td colspan='2' align='right'><br>";
 	echo "			<input type='hidden' name='id' value=\"$user_uuid\">";
 	echo "			<input type='hidden' name='username_old' value=\"$username\">";
+	echo "			<br><br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>";
 	echo "		</td>";
 	echo "	</tr>";
 	echo "</table>";
-
+	echo "<br><br>";
 	echo "</form>";
 
 //include the footer
diff --git a/resources/install.php b/resources/install.php
index 9c78262e85..e2a8f4e9ba 100644
--- a/resources/install.php
+++ b/resources/install.php
@@ -1412,7 +1412,7 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
 	if ($_POST["install_step"] == "") {
 		echo "<div id='page' align='center'>\n";
 		echo "<form method='post' name='frm' action=''>\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";
 		//echo "<td colspan='2' align='left' width='30%' nowrap><b>Installation</b></td>\n";
@@ -1781,7 +1781,7 @@ EOL;
 	if ($_POST["install_step"] == "2" && $_POST["db_type"] == "sqlite") {
 		echo "<div id='page' align='center'>\n";
 		echo "<form method='post' name='frm' action=''>\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";
 		echo "<td align='left' width='30%' nowrap><b>Installation: Step 2 - SQLite</b></td>\n";
@@ -1840,7 +1840,7 @@ EOL;
 		//echo "However if preferred the database can be created manually with the <a href='". echo PROJECT_PATH; ."/resources/install/sql/mysql.sql' target='_blank'>mysql.sql</a> script. ";
 		echo "<div id='page' align='center'>\n";
 		echo "<form method='post' name='frm' action=''>\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";
 		echo "<td align='left' width='30%' nowrap><b>Installation: Step 2 - MySQL</b></td>\n";
@@ -1952,7 +1952,7 @@ EOL;
 
 		echo "<div id='page' align='center'>\n";
 		echo "<form method='post' name='frm' action=''>\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";
 		echo "<td align='left' width='30%' nowrap><b>Installation: Step 2 - Postgres</b></td>\n";