From fc24ee893402902fc58632dabb5d7c2594e191d0 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 12 Mar 2015 13:00:10 +0100
Subject: [PATCH] Fixed many issues in output HTML code according to HTML 4.01
 Transitional format.

---
 access/login.php                              | 10 ++++----
 access/logout.php                             |  2 +-
 access/password_reset.php                     |  8 +++----
 admin/create_coy.php                          |  2 +-
 admin/crm_categories.php                      |  2 +-
 admin/db/attachments_db.inc                   |  4 ++--
 admin/inst_upgrade.php                        |  2 +-
 admin/security_roles.php                      |  2 +-
 gl/gl_bank.php                                |  2 +-
 gl/gl_journal.php                             |  2 +-
 gl/includes/ui/gl_bank_ui.inc                 |  4 ++--
 gl/includes/ui/gl_journal_ui.inc              | 15 ++++++------
 gl/inquiry/balance_sheet.php                  |  4 ++--
 gl/inquiry/profit_loss.php                    |  2 +-
 gl/view/bank_transfer_view.php                |  2 +-
 gl/view/gl_deposit_view.php                   |  4 ++--
 gl/view/gl_payment_view.php                   |  4 ++--
 gl/view/gl_trans_view.php                     |  4 ++--
 includes/page/footer.inc                      |  2 +-
 includes/page/header.inc                      |  6 ++---
 includes/system_tests.inc                     |  2 +-
 includes/ui/allocation_cart.inc               |  2 +-
 includes/ui/contacts_view.inc                 |  2 +-
 includes/ui/db_pager_view.inc                 |  4 ++--
 includes/ui/ui_controls.inc                   | 11 +++++----
 includes/ui/ui_input.inc                      | 23 +++++++++---------
 includes/ui/ui_lists.inc                      |  5 +++-
 includes/ui/ui_msgs.inc                       |  5 ++++
 includes/ui/ui_view.inc                       |  4 ++--
 includes/ui/view_package.php                  |  2 +-
 install/index.php                             |  2 +-
 inventory/adjustments.php                     |  2 +-
 inventory/includes/item_adjustments_ui.inc    |  4 ++--
 inventory/includes/stock_transfers_ui.inc     |  4 ++--
 inventory/manage/item_categories.php          |  2 +-
 inventory/manage/item_codes.php               |  2 +-
 inventory/manage/item_units.php               |  2 +-
 inventory/manage/movement_types.php           |  2 +-
 inventory/manage/sales_kits.php               |  2 +-
 inventory/prices.php                          |  2 +-
 inventory/purchasing_data.php                 |  2 +-
 inventory/reorder_level.php                   |  2 +-
 inventory/transfers.php                       |  2 +-
 inventory/view/view_adjustment.php            |  4 ++--
 inventory/view/view_transfer.php              |  4 ++--
 manufacturing/includes/manufacturing_ui.inc   |  6 ++---
 .../includes/work_order_issue_ui.inc          |  2 +-
 manufacturing/manage/bom_edit.php             |  2 +-
 manufacturing/manage/work_centres.php         |  2 +-
 manufacturing/work_order_issue.php            |  2 +-
 purchasing/includes/ui/grn_ui.inc             |  4 ++--
 purchasing/includes/ui/invoice_ui.inc         | 14 +++++------
 purchasing/includes/ui/po_ui.inc              |  6 ++---
 purchasing/inquiry/supplier_inquiry.php       |  2 +-
 purchasing/po_receive_items.php               |  2 +-
 purchasing/supplier_payment.php               |  4 ++--
 purchasing/view/view_grn.php                  |  2 +-
 purchasing/view/view_po.php                   |  4 ++--
 purchasing/view/view_supp_credit.php          |  6 ++---
 purchasing/view/view_supp_invoice.php         |  6 ++---
 purchasing/view/view_supp_payment.php         |  2 +-
 reporting/includes/reports_classes.inc        |  2 +-
 sales/create_recurrent_invoices.php           |  2 +-
 sales/credit_note_entry.php                   |  2 +-
 sales/customer_credit_invoice.php             |  8 +++----
 sales/customer_delivery.php                   |  8 +++----
 sales/customer_invoice.php                    |  8 +++----
 sales/customer_payments.php                   |  4 ++--
 sales/includes/ui/sales_credit_ui.inc         |  4 ++--
 sales/includes/ui/sales_order_ui.inc          | 11 +++++----
 sales/inquiry/customer_inquiry.php            |  2 +-
 sales/manage/sales_areas.php                  |  2 +-
 sales/manage/sales_groups.php                 |  2 +-
 sales/manage/sales_people.php                 |  2 +-
 sales/manage/sales_types.php                  |  2 +-
 sales/sales_order_entry.php                   |  2 +-
 sales/view/view_credit.php                    | 12 +++++-----
 sales/view/view_dispatch.php                  | 14 +++++------
 sales/view/view_invoice.php                   | 14 +++++------
 sales/view/view_receipt.php                   |  2 +-
 sales/view/view_sales_order.php               |  6 ++---
 taxes/item_tax_types.php                      |  2 +-
 themes/aqua/renderer.php                      | 24 +++++++++----------
 themes/cool/renderer.php                      | 22 ++++++++---------
 themes/default/renderer.php                   | 23 +++++++++---------
 85 files changed, 219 insertions(+), 208 deletions(-)

diff --git a/access/login.php b/access/login.php
index 45294376..0233354f 100644
--- a/access/login.php
+++ b/access/login.php
@@ -36,7 +36,7 @@ function defaultCompany()
 
 	if (check_faillog())
 	{
-		$blocked_msg = '<span class=redfg>'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
+		$blocked_msg = '<span class="redfg">'._('Too many failed login attempts.<br>Please wait a while or try later.').'</span>';
 
 	    $js .= "<script>setTimeout(function() {
 	    	document.getElementsByName('SubmitUser')[0].disabled=0;
@@ -57,7 +57,7 @@ function defaultCompany()
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
 	echo "<html dir='$rtl' >\n";
 	echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>\n";
-   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
+   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' >\n";
 	echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
  	echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
 	send_scripts();
@@ -78,14 +78,14 @@ function defaultCompany()
 	start_row();
 	echo "<td align='center' colspan=2>";
 	if (!$login_timeout) { // FA logo
-    	echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
+    	echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
 	} else { 
 		echo "<font size=5>"._('Authorization timeout')."</font>";
 	} 
 	echo "</td>\n";
 	end_row();
 
-	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
+	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' >\n";
 	if (!$login_timeout)
 		table_section_title(_("Version")." $version   Build $build_version - "._("Login"));
 	$value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($allow_demo_mode ? "demouser":"");
@@ -119,7 +119,7 @@ function defaultCompany()
 	}; 
 	end_table(1);
 	echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Login -->")."&nbsp;&nbsp;' name='SubmitUser'"
-		.($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." /></center>\n";
+		.($login_timeout ? '':" onclick='set_fullmode();'").(isset($blocked_msg) ? " disabled" : '')." ></center>\n";
 
 	foreach($_SESSION['timeout']['post'] as $p => $val) {
 		// add all request variables to be resend together with login data
diff --git a/access/logout.php b/access/logout.php
index 0e28a56d..ddf5ff4c 100644
--- a/access/logout.php
+++ b/access/logout.php
@@ -22,7 +22,7 @@ page_header(_("Logout"), true, false, '');
 
 echo "<table width='100%' border='0'>
   <tr>
-	<td align='center'><img src='$path_to_root/themes/default/images/logo_frontaccounting.png' alt='FrontAccounting' width='250' height='50' onload='fixPNG(this)' /></td>
+	<td align='center'><img src='$path_to_root/themes/default/images/logo_frontaccounting.png' alt='FrontAccounting' width='250' height='50' onload='fixPNG(this)' ></td>
   </tr>
   <tr>
     <td>&nbsp;</td>
diff --git a/access/password_reset.php b/access/password_reset.php
index 4ed58a2f..8ad67026 100644
--- a/access/password_reset.php
+++ b/access/password_reset.php
@@ -36,7 +36,7 @@ function defaultCompany()
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
 	echo "<html dir='$rtl' >\n";
 	echo "<head profile=\"http://www.w3.org/2005/10/profile\"><title>$title</title>\n";
-   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
+   	echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' >\n";
 	echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
  	echo "<link href='$path_to_root/themes/default/images/favicon.ico' rel='icon' type='image/x-icon'> \n";
 	send_scripts();
@@ -53,11 +53,11 @@ function defaultCompany()
 	start_table(false, "class='login'");
 	start_row();
 	echo "<td align='center' colspan=2>";
-  echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
+  echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
 	echo "</td>\n";
 	end_row();
 
-	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' />\n";
+	echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' >\n";
 	table_section_title(_("Version")." $version   Build $build_version - "._("Password reset"));
 
 	text_row(_("Email"), "email_entry_field", "", 20, 30);
@@ -81,7 +81,7 @@ function defaultCompany()
   end_row();
 	end_table(1);
 	echo "<center><input type='submit' value='&nbsp;&nbsp;"._("Send password -->")."&nbsp;&nbsp;' name='SubmitReset'
-		 onclick='set_fullmode();' /></center>\n";
+		 onclick='set_fullmode();'></center>\n";
 
 	end_form(1);
 	$Ajax->addScript(true, "document.forms[0].password.focus();");
diff --git a/admin/create_coy.php b/admin/create_coy.php
index db276a06..999f376c 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -241,7 +241,7 @@ function display_companies()
 	$coyno = $_SESSION["wa_current_user"]->company;
 
 	echo "
-		<script language='javascript'>
+		<script type='text/javascript'>
 		function deleteCompany(id, name) {
 			if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
 				return
diff --git a/admin/crm_categories.php b/admin/crm_categories.php
index 372faa71..f043443a 100644
--- a/admin/crm_categories.php
+++ b/admin/crm_categories.php
@@ -92,7 +92,7 @@ if ($Mode == 'RESET')
 $result = get_crm_categories(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=70%");
+start_table(TABLESTYLE, "width='70%'");
 
 $th = array(_("Category Type"), _("Category Subtype"), _("Short Name"), _("Description"),  "", "&nbsp;");
 inactive_control_column($th);
diff --git a/admin/db/attachments_db.inc b/admin/db/attachments_db.inc
index 5712b22a..49f73b09 100644
--- a/admin/db/attachments_db.inc
+++ b/admin/db/attachments_db.inc
@@ -65,9 +65,9 @@ function get_attachment_string($type, $id)
         if (strlen($str_return))
             $str_return = $str_return . " \n";    
         $str_return .= _("Attached File:")." <a href='$path_to_root/admin/attachments.php?vw=".$attachment["id"]." ' target='blanc_'> ". 
-        	$attachment["id"] . " " . $attachment["description"]. " - ". $attachment["filename"]."</a><br/>";
+        	$attachment["id"] . " " . $attachment["description"]. " - ". $attachment["filename"]."</a><br>";
     }
-    return $str_return . "<br/>";
+    return $str_return . "<br>";
 }
 
 //----------------------------------------------------------------------------------------
diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 9691b22e..d650aafa 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -157,7 +157,7 @@ foreach($installers as $i => $inst)
 		if (!$check)
 			check_cells(null,'install_'.$i, 0);
 		else {
-			label_cell("<span class=redfg>"
+			label_cell("<span class='redfg'>"
 				. sprintf(_("Partially installed (%s)"), $check) . "</span>");
 			$partial++;
 		}
diff --git a/admin/security_roles.php b/admin/security_roles.php
index f8b44552..8c96b1eb 100644
--- a/admin/security_roles.php
+++ b/admin/security_roles.php
@@ -197,7 +197,7 @@ start_table(TABLESTYLE2);
 	record_status_list_row(_("Current status:"), 'inactive');
 end_table(1);
 
-	start_table(TABLESTYLE, "width=40%");
+	start_table(TABLESTYLE, "width='40%'");
 
 	$k = $j = 0; //row colour counter
 	$ext = $sec = $m = -1;
diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 788cf83b..5bc7cecd 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -401,7 +401,7 @@ start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
diff --git a/gl/gl_journal.php b/gl/gl_journal.php
index be1dc607..6d1fd90a 100644
--- a/gl/gl_journal.php
+++ b/gl/gl_journal.php
@@ -323,7 +323,7 @@ start_form();
 
 display_order_header($_SESSION['journal_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items(_("Rows"), $_SESSION['journal_items']);
diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 7d98271b..981569c4 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -17,7 +17,7 @@ function display_bank_header(&$order)
 	$customer_error = false;
 	div_start('pmt_header');
 
-	start_outer_table(TABLESTYLE2, "width=90%"); // outer table
+	start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
 
 	table_section(1);
 	
@@ -146,7 +146,7 @@ function display_gl_items($title, &$order)
 	display_heading($title);
 
     div_start('items_table');
-	start_table(TABLESTYLE, "colspan=7 width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
diff --git a/gl/includes/ui/gl_journal_ui.inc b/gl/includes/ui/gl_journal_ui.inc
index 8c4aec6a..1bb56c2a 100644
--- a/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@ -20,17 +20,15 @@ function display_order_header(&$Order)
 
 	$qes = has_quick_entries(QE_JOURNAL);
 	$new = $Order->order_id==0;
-	start_outer_table(TABLESTYLE2, "width=90%");
+
+	hidden('ref_original');
+	start_outer_table(TABLESTYLE2, "width='90%'");
 	table_section(1, $qes ? "20%" : "");
 
-	start_row();
-    date_cells(_("Date:"), 'date_', '', $new);
+    date_row(_("Date:"), 'date_', '', $new);
 
 	table_section(2, $qes ? "20%" : "50%");
-	ref_cells(_("Reference:"), 'ref', '');
-	hidden('ref_original');
-	end_row();
-
+	ref_row(_("Reference:"), 'ref', '');
 
  	if ($new) {
 		table_section(3, "20%");
@@ -78,7 +76,7 @@ function display_gl_items($title, &$order)
 	$dim = get_company_pref('use_dimension');
 
     div_start('items_table');
-	start_table(TABLESTYLE, "colspan=7 width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
 			_("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");
@@ -207,6 +205,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		if ($dim > 1)
 			dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
 	}
+
 	if ($dim < 1)
 		hidden('dimension_id', 0);
 	if ($dim < 2)
diff --git a/gl/inquiry/balance_sheet.php b/gl/inquiry/balance_sheet.php
index 01dc3c1e..7bec22c0 100644
--- a/gl/inquiry/balance_sheet.php
+++ b/gl/inquiry/balance_sheet.php
@@ -156,7 +156,7 @@ function display_balance_sheet()
 
 	div_start('balance_tbl');
 	
-	start_table(TABLESTYLE, "width=30%");			
+	start_table(TABLESTYLE, "width='30%'");
 		
 	if (!$drilldown) //Root Level
 	{		
@@ -172,7 +172,7 @@ function display_balance_sheet()
 		while ($class = db_fetch($classresult))
 		{	
 			$classclose = 0.0;
-			$convert = get_class_type_convert($class["ctype"]); 		
+			$convert = get_class_type_convert($class["ctype"]);
 			$ctype = $class["ctype"];
 			$classname = $class["class_name"];	
 
diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php
index 3e7a26f4..b2a09d4f 100644
--- a/gl/inquiry/profit_loss.php
+++ b/gl/inquiry/profit_loss.php
@@ -229,7 +229,7 @@ function display_profit_and_loss()
 	
 	div_start('pl_tbl');
 
-	start_table(TABLESTYLE, "width=50%");
+	start_table(TABLESTYLE, "width='50%'");
 
 	$tableheader =  "<tr>
         <td class='tableheader'>" . _("Group/Account Name") . "</td>
diff --git a/gl/view/bank_transfer_view.php b/gl/view/bank_transfer_view.php
index 5d0d0a02..a6a851ac 100644
--- a/gl/view/bank_transfer_view.php
+++ b/gl/view/bank_transfer_view.php
@@ -61,7 +61,7 @@ if ($from_trans['bank_curr_code'] != $to_trans['bank_curr_code'])
 display_heading($systypes_array[ST_BANKTRANSFER] . " #$trans_no");
 
 echo "<br>";
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 
 start_row();
 label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'");
diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 88d315aa..6ff9bf4d 100644
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -48,7 +48,7 @@ echo "<center>";
 display_heading(_("GL Deposit") . " #$trans_no");
 
 echo "<br>";
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 
 if ($show_currencies)
 {
@@ -98,7 +98,7 @@ else
 	if ($show_currencies)
 		display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $dim = get_company_pref('use_dimension');
     if ($dim == 2)
         $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2",
diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php
index 344eec35..eb99749c 100644
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -46,7 +46,7 @@ if ($from_trans['bank_curr_code'] != $from_trans['settle_curr'])
 display_heading(_("GL Payment") . " #$trans_no");
 
 echo "<br>";
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 
 if ($show_currencies)
 {
@@ -97,7 +97,7 @@ else
 		display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
     echo "<br>";
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $dim = get_company_pref('use_dimension');
     if ($dim == 2)
         $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1", _("Dimension")." 2",
diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 4e61fef9..e80914eb 100644
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -31,7 +31,7 @@ function display_gl_heading($myrow)
 {
 	global $systypes_array;
 	$trans_name = $systypes_array[$_GET['type_id']];
-    start_table(TABLESTYLE, "width=95%");
+    start_table(TABLESTYLE, "width='95%'");
     $th = array(_("General Ledger Transaction Details"), _("Reference"),
     	_("Date"), _("Person/Item"));
     table_header($th);	
@@ -78,7 +78,7 @@ while ($myrow = db_fetch($result))
 	if (!$heading_shown)
 	{
 		display_gl_heading($myrow);
-		start_table(TABLESTYLE, "width=95%");
+		start_table(TABLESTYLE, "width='95%'");
 		table_header($th);
 		$heading_shown = true;
 	}	
diff --git a/includes/page/footer.inc b/includes/page/footer.inc
index e3d4c261..5804c334 100644
--- a/includes/page/footer.inc
+++ b/includes/page/footer.inc
@@ -23,7 +23,7 @@ function page_footer($no_menu=false, $is_index=false)
 	$edits = "editors = ".$Ajax->php2js($Editors).";";
 	$Ajax->addScript('editors', $edits);
 
-	echo "<script>
+	echo "<script type='text/javascript'>
 		_focus = '" . get_post('_focus') . "';
 		_validate = " . $Ajax->php2js($Validate).";
 		var $edits
diff --git a/includes/page/header.inc b/includes/page/header.inc
index 0ae62638..7dd84b65 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -40,9 +40,9 @@ function help_url($context=null)
 	if ($clean)
 		$help_page_url = access_string($help_page_url, true);
 
-	return $help_base_url
+	return htmlspecialchars($help_base_url
 		.urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
-		.'&ctxhelp=1&lang='.$country;
+		.'&ctxhelp=1&lang='.$country);
 }
 
 function send_scripts()
@@ -121,7 +121,7 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
 	$encoding = $_SESSION['language']->encoding;
 
 	if (!headers_sent()){
-		header("Content-type: text/html; charset='$encoding'");
+		header("Content-type: text/html; charset=$encoding");
 	}
 	echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
 	echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
diff --git a/includes/system_tests.inc b/includes/system_tests.inc
index 0729ec43..9ea89d01 100644
--- a/includes/system_tests.inc
+++ b/includes/system_tests.inc
@@ -416,7 +416,7 @@ function display_system_tests($install = false)
 		);
 
 
-	start_table(TABLESTYLE, "width=80%");
+	start_table(TABLESTYLE, "width='80%'");
 	$th = array(_("Test"), _('Test type'), _("Value"), _("Comments"));
 	table_header($th);
 
diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 2821fe5f..c60c88fe 100644
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -284,7 +284,7 @@ function show_allocatable($show_totals) {
 	{
 		if ($cart->currency != $cart->person_curr)
 			display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
-		start_table(TABLESTYLE, "width=60%");
+		start_table(TABLESTYLE, "width='60%'");
    		$th = array(_("Transaction Type"), _("#"), $supp_ref ? _("Supplier Ref"): _("Ref"), _("Date"), _("Due Date"), _("Amount"),
    			_("Other Allocations"), _("Left to Allocate"), _("This Allocation"),'','');
 
diff --git a/includes/ui/contacts_view.inc b/includes/ui/contacts_view.inc
index 3cdc3c1a..21cbf4bd 100644
--- a/includes/ui/contacts_view.inc
+++ b/includes/ui/contacts_view.inc
@@ -36,7 +36,7 @@ class contacts extends simple_crud {
 
 			$contacts = get_crm_persons($this->class, $this->subclass, $this->entity);
 //				check_value('show_inactive'));
-			start_table(TABLESTYLE, "width=80%");
+			start_table(TABLESTYLE, "width='80%'");
 
 			$th = array(_('Assignment'), _("Reference"), _("Full Name"), _("Phone"), _("Sec Phone"), _("Fax"),
 				_("email"),  '',
diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index e8718c63..950729d1 100644
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -61,7 +61,7 @@ function display_db_pager(&$pager) {
  		}
 	}
     /* show a table of records returned by the sql */
-    start_table(TABLESTYLE, "width=$pager->width");
+    start_table(TABLESTYLE, "width='$pager->width'");
     table_header($headers);
 
 	if($pager->header_fun) {	// if set header handler
@@ -103,7 +103,7 @@ function display_db_pager(&$pager) {
 		   }
 		   switch($coltype) { // format column
 		    case 'time':
-		  	  label_cell($cell, "width=40"); break;
+		  	  label_cell($cell, "width='40'"); break;
 		    case 'date':
 		  	  label_cell(sql2date($cell), "align='center' nowrap"); break;
 		    case 'dstamp':	// time stamp displayed as date
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 62506205..65e0071c 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -53,7 +53,7 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
 
 function end_form($breaks=0)
 {
-	global $Ajax;
+	global $Ajax, $hidden_fields;
 
 	$_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
 	if ($breaks)
@@ -61,7 +61,8 @@ function end_form($breaks=0)
 	hidden('_focus');
 	hidden('_modified', get_post('_modified', 0));
 	hidden('_token', $_SESSION['csrf_token']);
-	echo "</form>\n";
+	
+	echo implode('', $hidden_fields)."</form>\n";
 	$Ajax->activate('_token');
 }
 
@@ -87,7 +88,7 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
 		echo " class='tablestyle'";
 	if ($extra != "")
 		echo " $extra";
-	echo " cellpadding=$padding cellspacing=$spacing>\n";
+	echo " cellpadding='$padding' cellspacing='$spacing'>\n";
 }
 
 function end_table($breaks=0)
@@ -110,7 +111,7 @@ function table_section($number=1, $width=false)
 	if ($number > 1)
 	{
 		echo "</table>\n";
-		$width = ($width ? "width=$width" : "");
+		$width = ($width ? "width='$width'" : "");
 		//echo "</td><td class='tableseparator' $width>\n"; // outer table
 		echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
 	}
@@ -181,7 +182,7 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $f
     	echo $attach;	
     }
 	$width = ($id != 0 ? "30%" : "20%");	
-	start_table(false, "width=$width");
+	start_table(false, "width='$width'");
 	start_row();
 	if ($no_menu)
 	{
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 5c0cacd1..4f02f9b2 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -85,10 +85,11 @@ function input_num($postname=null, $dflt=0)
 }
 
 //---------------------------------------------------------------------------------
+$hidden_fields = array();	// store for hiddn fields attached just before form end (for proper html validation)
 
 function hidden($name, $value=null, $echo=true)
 {
-  	global $Ajax;
+  	global $Ajax, $hidden_fields;
 	
 	if ($value === null) 
 		$value = get_post($name);
@@ -96,7 +97,7 @@ function hidden($name, $value=null, $echo=true)
   	$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
 	$Ajax->addUpdate($name, $name, $value);
 	if ($echo)
-		echo $ret."\n";
+			$hidden_fields[] = $ret;
 	else
 		return $ret;
 }
@@ -127,7 +128,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 
 	} elseif (!is_bool($atype)) { // necessary: switch uses '=='
 
-		$aspect = "aspect='$atype' ";
+		$aspect = " aspect='$atype' ";
 		$types = explode(' ', $atype);
 
 		foreach ($types as $type) {
@@ -155,7 +156,7 @@ function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
 	    ." name=\"$name\"  id=\"$name\" value=\"$value\""
 	    .($title ? " title='$title'" : '')
 	    .">"
-		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12'>" : '')
+		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12' alt=''>" : '')
 		."<span>$value</span>"
 		."</button>\n";
 	if ($echo)
@@ -268,7 +269,7 @@ function set_icon($icon, $title=false)
 	global $path_to_root;
 	if (basename($icon) === $icon) // standard icons does not contain path separator
 		$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
-	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
+	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." >\n";	
 }
 
 function button($name, $value, $title=false, $icon=false,  $aspect='')
@@ -290,7 +291,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 			."' value='1'" . ($title ? " title='$title'":" title='$value'")
 			. ($aspect ? " aspect='$aspect'" : '')
 			. $rel
-			." />".set_icon($icon)."</button>\n";
+			." >".set_icon($icon)."</button>\n";
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
@@ -300,7 +301,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 			.($title ? " title='$title'":'')
 			. ($aspect ? " aspect='$aspect'" : '')
 			. $rel
-			." />\n";
+			." >\n";
 }
 
 function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@ -464,14 +465,14 @@ function qty_cell($label, $bold=false, $dec=null, $id=null)
 		label_cell(number_format2($label, $dec), "nowrap align=right", $id);
 }
 
-function label_cells($label, $value, $params="", $params2="", $id='')
+function label_cells($label, $value, $params="", $params2="", $id=null)
 {
 	if ($label != null)
 		echo "<td $params>$label</td>\n";
 	label_cell($value, $params2, $id);
 }
 
-function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='')
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=null)
 {
 	echo "<tr>";
 	if ($params == "")
@@ -666,7 +667,7 @@ function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_mon
 function password_row($label, $name, $value)
 {
 	echo "<tr><td class='label'>$label</td>";
-	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' />");
+	label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' >");
 	echo "</tr>\n";
 }	
 
@@ -675,7 +676,7 @@ function file_cells($label, $name, $id="")
 {
 	if ($id != "")
 		$id = "id='$id'";
-	label_cells($label, "<input type='file' name='$name' $id />");
+	label_cells($label, "<input type='file' name='$name' $id >");
 }		
 function file_row($label, $name, $id = "")
 {
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 27f812da..456f0193 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -214,11 +214,15 @@ $opts = array(		// default options
 			}
 			$cat = $contact_row[$opts['category']];
 			if ($opts['category'] !== false && $cat != $lastcat){
+				if ($lastcat!==null)
+					$selector .= "</optgroup>";
 				$selector .= "<optgroup label='".$cat."'>\n";
 				$lastcat = $cat;
 			}
 			$selector .= "<option $sel $optclass value='$value'>$descr</option>\n";
 		}
+		if ($lastcat!==null)
+			$selector .= "</optgroup>";
 		db_free_result($result);
 	}
 
@@ -368,7 +372,6 @@ $opts = array(		// default options
 
 	if ($first_id!==false) {
 		$sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
-		$selector = sprintf($first_opt, $sel).$selector;
 	}
 	// Prepend special option.
 	if ($spec_option !== false) { // if special option used - add it
diff --git a/includes/ui/ui_msgs.inc b/includes/ui/ui_msgs.inc
index 1319f362..1d6d765c 100644
--- a/includes/ui/ui_msgs.inc
+++ b/includes/ui/ui_msgs.inc
@@ -29,6 +29,11 @@ function display_notification_centered($msg)
 	display_notification($msg, true);
 }
 
+function display_caption($msg)
+{
+	echo "<caption>$msg</caption>\n";
+}
+
 function display_heading($msg)
 {
 	echo "<center><span class='headingtext'>$msg</span></center>\n";	
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9a9eb093..cc003088 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -337,7 +337,7 @@ function is_voided_display($type, $id, $label)
 	if ($void_entry == null)
 		return false;
 
-	start_table(TABLESTYLE, "width=50%");
+	start_table(TABLESTYLE, "width='50%'");
 	echo "<tr><td align=center><font color=red>$label</font><br>";
 	echo "<font color=red>" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "</font><br>";
 	if (strlen($void_entry["memo_"]) > 0)
@@ -542,7 +542,7 @@ function display_allocations($alloc_result, $total, $payments=false)
 
     display_heading2(($payments ? _("Payments") : _("Allocations")));
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
 
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
     	_("Left to Allocate"), _("This Allocation"));
diff --git a/includes/ui/view_package.php b/includes/ui/view_package.php
index dee8a2f9..ff015da9 100644
--- a/includes/ui/view_package.php
+++ b/includes/ui/view_package.php
@@ -43,7 +43,7 @@ $pkg = get_package_info($_GET['id'], null, $filter);
 
 display_heading(sprintf(_("Content information for package '%s'"), $_GET['id']));
 br();
-start_table(TABLESTYLE2, "width=80%");
+start_table(TABLESTYLE2, "width='80%'");
 $th = array(_("Property"), _("Value"));
 table_header($th);
 
diff --git a/install/index.php b/install/index.php
index fc27f030..2e611766 100644
--- a/install/index.php
+++ b/install/index.php
@@ -31,7 +31,7 @@ function subpage_title($txt)
 {
 	global $path_to_root;
 	
-	echo '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" />
+	echo '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" >
 		</center>';
 
 	$page = @$_POST['Page'] ? $_POST['Page'] : 1;
diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index dc14d93e..33c24b62 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -224,7 +224,7 @@ start_form();
 
 display_order_header($_SESSION['adj_items']);
 
-start_outer_table(TABLESTYLE, "width=70%", 10);
+start_outer_table(TABLESTYLE, "width='70%'", 10);
 
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();
diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index 12571b8a..a390634a 100644
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -28,7 +28,7 @@ function display_order_header(&$order)
 {
 	global $Refs;
 
-	start_outer_table(TABLESTYLE2, "width=70%"); // outer table
+	start_outer_table(TABLESTYLE2, "width='70%'"); // outer table
 	table_section(1);
 
 	locations_list_row(_("Location:"), 'StockLocation', null);
@@ -58,7 +58,7 @@ function display_adjustment_items($title, &$order)
 
 	display_heading($title);
     div_start('items_table');
-	start_table(TABLESTYLE, "width=80%");
+	start_table(TABLESTYLE, "width='80%'");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Unit"), _("Unit Cost"), _("Total"), "");
 	if ( count($order->line_items)) $th[] = '';
diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc
index 026e0b6e..daa59661 100644
--- a/inventory/includes/stock_transfers_ui.inc
+++ b/inventory/includes/stock_transfers_ui.inc
@@ -28,7 +28,7 @@ function display_order_header(&$order)
 {
 	global $Refs;
 
-	start_outer_table(TABLESTYLE, "width=70%");
+	start_outer_table(TABLESTYLE, "width='70%'");
 
 	table_section(1);
 	
@@ -56,7 +56,7 @@ function display_transfer_items($title, &$order)
 
 	display_heading($title);
     div_start('items_table');
-	start_table(TABLESTYLE, "width=80%");
+	start_table(TABLESTYLE, "width='80%'");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), '');
 	if ( count($order->line_items)) $th[] = '';
 	table_header($th);
diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php
index b52d67c8..c42d910e 100644
--- a/inventory/manage/item_categories.php
+++ b/inventory/manage/item_categories.php
@@ -94,7 +94,7 @@ if (list_updated('mb_flag')) {
 $result = get_item_categories(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 $th = array(_("Name"), _("Tax type"), _("Units"), _("Type"), _("Sales Act"),
 _("Inventory Account"), _("COGS Account"), _("Adjustment Account"),
 _("Assembly Account"), "", "");
diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php
index 892c0a35..4ada6e3e 100644
--- a/inventory/manage/item_codes.php
+++ b/inventory/manage/item_codes.php
@@ -119,7 +119,7 @@ $dflt_cat = $result['category_id'];
 
 $result = get_all_item_codes($_POST['stock_id']);
 div_start('code_table');
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 
 	$th = array(_("EAN/UPC Code"), _("Quantity"), _("Units"), 
 		_("Description"),_("Category"), "", "");
diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php
index 249c09d2..2835d593 100644
--- a/inventory/manage/item_units.php
+++ b/inventory/manage/item_units.php
@@ -90,7 +90,7 @@ if ($Mode == 'RESET')
 $result = get_all_item_units(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=40%");
+start_table(TABLESTYLE, "width='40%'");
 $th = array(_('Unit'), _('Description'), _('Decimals'), "", "");
 inactive_control_column($th);
 
diff --git a/inventory/manage/movement_types.php b/inventory/manage/movement_types.php
index e7086f94..7f336b0d 100644
--- a/inventory/manage/movement_types.php
+++ b/inventory/manage/movement_types.php
@@ -90,7 +90,7 @@ if ($Mode == 'RESET')
 $result = get_all_movement_type(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Description"), "", "");
 inactive_control_column($th);
diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 2aef8e8b..a327de2d 100644
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -36,7 +36,7 @@ function display_kit_items($selected_kit)
 {
 	$result = get_item_kit($selected_kit);
 	div_start('bom');
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 	$th = array(_("Stock Item"), _("Description"), _("Quantity"), _("Units"),
 		'','');
 	table_header($th);
diff --git a/inventory/prices.php b/inventory/prices.php
index 66d3bee0..650728ca 100644
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -141,7 +141,7 @@ if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) || isset($_P
 $prices_list = get_prices($_POST['stock_id']);
 
 div_start('price_table');
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Currency"), _("Sales Type"), _("Price"), "", "");
 table_header($th);
diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index d0b1685d..96b205e0 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -142,7 +142,7 @@ else
     }
     else
     {
-        start_table(TABLESTYLE, "width=65%");
+        start_table(TABLESTYLE, "width='65%'");
 
 		$th = array(_("Supplier"), _("Price"), _("Currency"),
 			_("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index bd517f25..c34ba672 100644
--- a/inventory/reorder_level.php
+++ b/inventory/reorder_level.php
@@ -60,7 +60,7 @@ div_end();
 set_global_stock_item($_POST['stock_id']);
 
 div_start('reorders');
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Location"), _("Quantity On Hand"), _("Re-Order Level"));
 table_header($th);
diff --git a/inventory/transfers.php b/inventory/transfers.php
index 39768dc9..f7ae7d95 100644
--- a/inventory/transfers.php
+++ b/inventory/transfers.php
@@ -218,7 +218,7 @@ start_form();
 
 display_order_header($_SESSION['transfer_items']);
 
-start_table(TABLESTYLE, "width=70%", 10);
+start_table(TABLESTYLE, "width='70%'", 10);
 start_row();
 echo "<td>";
 display_transfer_items(_("Items"), $_SESSION['transfer_items']);
diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php
index e5722c54..4b94c7c3 100644
--- a/inventory/view/view_adjustment.php
+++ b/inventory/view/view_adjustment.php
@@ -38,7 +38,7 @@ while ($adjustment = db_fetch($adjustment_items))
 	{
 		$adjustment_type = get_movement_type($adjustment['person_id']) ;
 
-		start_table(TABLESTYLE2, "width=90%");
+		start_table(TABLESTYLE2, "width='90%'");
 		start_row();
 		label_cells(_("At Location"), $adjustment['location_name'], "class='tableheader2'");
     	label_cells(_("Reference"), $adjustment['reference'], "class='tableheader2'", "colspan=6");
@@ -51,7 +51,7 @@ while ($adjustment = db_fetch($adjustment_items))
 		$header_shown = true;
 
 		echo "<br>";
-		start_table(TABLESTYLE, "width=90%");
+		start_table(TABLESTYLE, "width='90%'");
 
     	$th = array(_("Item"), _("Description"), _("Quantity"),
     		_("Units"), _("Unit Cost"));
diff --git a/inventory/view/view_transfer.php b/inventory/view/view_transfer.php
index 86ad8bfa..d3bd8a5f 100644
--- a/inventory/view/view_transfer.php
+++ b/inventory/view/view_transfer.php
@@ -33,7 +33,7 @@ $to_trans = $transfer_items[1];
 display_heading($systypes_array[ST_LOCTRANSFER] . " #$trans_no");
 
 echo "<br>";
-start_table(TABLESTYLE2, "width=90%");
+start_table(TABLESTYLE2, "width='90%'");
 
 start_row();
 label_cells(_("Item"), $from_trans['stock_id'] . " - " . $from_trans['description'], "class='tableheader2'");
@@ -51,7 +51,7 @@ comments_display_row(ST_LOCTRANSFER, $trans_no);
 
 end_table(2);
 
-start_table(TABLESTYLE, "width=90%");
+start_table(TABLESTYLE, "width='90%'");
 
 $th = array(_("Item"), _("Description"), _("Quantity"), _("Units"));
 table_header($th);
diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc
index f2cde17f..dfedbb29 100644
--- a/manufacturing/includes/manufacturing_ui.inc
+++ b/manufacturing/includes/manufacturing_ui.inc
@@ -79,7 +79,7 @@ function display_wo_requirements($woid, $quantity, $show_qoh=false, $date=null)
     else
     {
 
-        start_table(TABLESTYLE, "width=80%");
+        start_table(TABLESTYLE, "width='80%'");
         $th = array(_("Component"), _("From Location"), _("Work Centre"),
         	_("Unit Quantity"), _("Total Quantity"), _("Units Issued"), _("On Hand"));
 
@@ -270,7 +270,7 @@ function display_wo_details($woid, $suppress_view_link=false)
     	exit;
     }
 
-   	start_table(TABLESTYLE, "width=80%");
+   	start_table(TABLESTYLE, "width='80%'");
 
 	if ($myrow["released"] == true)
 		$th = array(_("#"), _("Reference"), _("Type"), _("Manufactured Item"),
@@ -326,7 +326,7 @@ function display_wo_details_quick($woid, $suppress_view_link=false)
     	exit;
     }
 
-   	start_table(TABLESTYLE, "width=80%");
+   	start_table(TABLESTYLE, "width='80%'");
 
 	$th = array(_("#"), _("Reference"), _("Type"), _("Manufactured Item"),
 		_("Into Location"), _("Date"), _("Quantity"));
diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc
index e70ce571..98aeeb7d 100644
--- a/manufacturing/includes/work_order_issue_ui.inc
+++ b/manufacturing/includes/work_order_issue_ui.inc
@@ -29,7 +29,7 @@ function display_issue_items($title, &$order)
 
 	display_heading($title);
     div_start('items_table');
-	start_table(TABLESTYLE, "width=80% colspan=7");
+	start_table(TABLESTYLE, "width='80%'");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Unit"), _("Unit Cost"), '');
 	if ( count($order->line_items)) $th[] = '';
diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php
index 9734dfa4..f69abf5f 100644
--- a/manufacturing/manage/bom_edit.php
+++ b/manufacturing/manage/bom_edit.php
@@ -66,7 +66,7 @@ function display_bom_items($selected_parent)
 {
 	$result = get_bom($selected_parent);
 	div_start('bom');
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 	$th = array(_("Code"), _("Description"), _("Location"),
 		_("Work Centre"), _("Quantity"), _("Units"),'','');
 	table_header($th);
diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php
index 10fcf365..ebc25034 100644
--- a/manufacturing/manage/work_centres.php
+++ b/manufacturing/manage/work_centres.php
@@ -97,7 +97,7 @@ if ($Mode == 'RESET')
 $result = get_all_work_centres(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=50%");
+start_table(TABLESTYLE, "width='50%'");
 $th = array(_("Name"), _("description"), "", "");
 inactive_control_column($th);
 table_header($th);
diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php
index cfd4d197..6aa7f3f2 100644
--- a/manufacturing/work_order_issue.php
+++ b/manufacturing/work_order_issue.php
@@ -211,7 +211,7 @@ echo "<br>";
 
 start_form();
 
-start_table(TABLESTYLE, "width=90%", 10);
+start_table(TABLESTYLE, "width='90%'", 10);
 echo "<tr><td>";
 display_issue_items(_("Items to Issue"), $_SESSION['issue_items']);
 issue_options_controls();
diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index 059c7bd1..ea654efa 100644
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -14,7 +14,7 @@
 function display_grn_summary(&$po)
 {
 	global $Refs;
-    start_table(TABLESTYLE2, "width=90%");
+    start_table(TABLESTYLE2, "width='90%'");
 
     start_row();
 	label_cells(_("Supplier"), $po->supplier_name, "class='tableheader2'");
@@ -46,7 +46,7 @@ function edit_grn_summary(&$po)
 {
 	global $Refs;
 
-	start_outer_table(TABLESTYLE2, "width=80%");
+	start_outer_table(TABLESTYLE2, "width='80%'");
 
 	table_section(1);
 		label_row(_("Supplier"), $po->supplier_name);
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index ff9c8468..fafe4c5d 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -74,7 +74,7 @@ function invoice_header(&$supp_trans)
 	if (!isset($_POST['tran_date']))
 		copy_from_trans($supp_trans);
 
-	start_outer_table(TABLESTYLE2, "width=95%");
+	start_outer_table(TABLESTYLE2, "width='95%'");
 
 	table_section(1);
 
@@ -154,7 +154,7 @@ function invoice_totals(&$supp_trans)
 
 	$dim = get_company_pref('use_dimension');
  	$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
-   	start_table(TABLESTYLE, "width=95%");
+   	start_table(TABLESTYLE, "width='95%'");
    	label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
 
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
@@ -221,7 +221,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	else
 		$heading = _("GL Items for this Credit Note");
 
-	start_outer_table(TABLESTYLE, "width=95%");
+	start_outer_table(TABLESTYLE, "width='95%'");
 
 	if ($mode == 1)
 	{
@@ -251,7 +251,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 	end_outer_table(0, false);
 
 	div_start('gl_items');
-	start_table(TABLESTYLE, "width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	$dim = get_company_pref('use_dimension');
 	if ($dim == 2)
@@ -432,7 +432,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     if (($mode == 2  || $mode == 3) && count($supp_trans->grn_items) == 0)
     	return 0;
 
-	start_outer_table("style='border:1px solid #cccccc;' width=95%");
+	start_outer_table("style='border:1px solid #cccccc;' width='95%'");
 
 	$heading2 = "";
 	if ($mode == 1)
@@ -471,14 +471,14 @@ function display_grn_items(&$supp_trans, $mode=0)
 		{
 			display_note($heading2, 0, 0, "class='overduefg'");
 		}	
-		echo "</td><td width=10% align='right'>";
+		echo "</td><td width='10%' align='right'>";
 		submit('InvGRNAll', _("Add All Items"), true, false,true);
 	}	
 
 	end_outer_table(0, false);
 
   	div_start('grn_items');
-	start_table(TABLESTYLE, "width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 	if ($mode == 1)
 	{
     	$th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 728d2e7c..37e2a81f 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -116,7 +116,7 @@ function display_po_header(&$order)
 
 	$editable = ($order->order_no == 0);
 
-	start_outer_table(TABLESTYLE2, 'width=80%');
+	start_outer_table(TABLESTYLE2, "width='80%'");
 
 	table_section(1);
     if ($editable)
@@ -228,7 +228,7 @@ function display_po_items(&$order, $editable=true)
     display_heading(_("Order Items"));
 
     div_start('items_table');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
 
    	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Received"), _("Unit"),
@@ -305,7 +305,7 @@ function display_po_items(&$order, $editable=true)
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-    start_table(TABLESTYLE, "width=90%");
+    start_table(TABLESTYLE, "width='90%'");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");
diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php
index 1e106d0e..73393a20 100644
--- a/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@ -72,7 +72,7 @@ function display_supplier_summary($supplier_record)
 	$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 	
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
     	$pastdue1, $pastdue2, _("Total Balance"));
 
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index f80130e6..9fd0c753 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -58,7 +58,7 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
 function display_po_receive_items()
 {
 	div_start('grn_items');
-    start_table(TABLESTYLE, "colspan=7 width=90%");
+    start_table(TABLESTYLE, "colspan=7 width='90%'");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
     	_("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
     table_header($th);
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index b4e6c878..bb22a30f 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -268,7 +268,7 @@ if (isset($_POST['ProcessSuppPayment']))
 
 start_form();
 
-	start_outer_table(TABLESTYLE2, "width=60%", 5);
+	start_outer_table(TABLESTYLE2, "width='60%'", 5);
 
 	table_section(1);
 
@@ -319,7 +319,7 @@ start_form();
 	show_allocatable(false);
 	div_end();
 
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 	amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency);
 	amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency);
 	textarea_row(_("Memo:"), 'memo_', null, 22, 4);
diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 31126c97..d06e8ebf 100644
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -36,7 +36,7 @@ display_grn_summary($purchase_order);
 
 display_heading2(_("Line Details"));
 
-start_table(TABLESTYLE, "colspan=9 width=90%");
+start_table(TABLESTYLE, "width='90%'");
 $th = array(_("Item Code"), _("Item Description"), _("Delivery Date"), _("Quantity"),
 	_("Unit"), _("Price"), _("Line Total"), _("Quantity Invoiced"));
 
diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index ef54291f..6463f55d 100644
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -35,12 +35,12 @@ read_po($_GET['trans_no'], $purchase_order);
 echo "<br>";
 display_po_summary($purchase_order, true);
 
-start_table(TABLESTYLE, "width=90%", 6);
+start_table(TABLESTYLE, "width='90%'", 6);
 echo "<tr><td valign=top>"; // outer table
 
 display_heading2(_("Line Details"));
 
-start_table(TABLESTYLE, "colspan=9 width=100%");
+start_table(TABLESTYLE, "width='100%'");
 
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"),
 	_("Requested By"), _("Line Total"), _("Quantity Received"), _("Quantity Invoiced"));
diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php
index cdaeb3fe..bad33fce 100644
--- a/purchasing/view/view_supp_credit.php
+++ b/purchasing/view/view_supp_credit.php
@@ -37,7 +37,7 @@ read_supp_invoice($trans_no, ST_SUPPCREDIT, $supp_trans);
 
 display_heading("<font color=red>" . _("SUPPLIER CREDIT NOTE") . " # " . $trans_no . "</font>");
 echo "<br>";
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 start_row();
 label_cells(_("Supplier"), $supp_trans->supplier_name, "class='tableheader2'");
 label_cells(_("Reference"), $supp_trans->reference, "class='tableheader2'");
@@ -56,8 +56,8 @@ $total_grn = display_grn_items($supp_trans, 2);
 
 $display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec());
 
-start_table(TABLESTYLE, "width=95%");
-label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=17%");
+start_table(TABLESTYLE, "width='95%'");
+label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width='17%'");
 
 $tax_items = get_trans_tax_details(ST_SUPPCREDIT, $trans_no);
 display_supp_trans_tax_details($tax_items, 1);
diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php
index 025e6581..8ce3887b 100644
--- a/purchasing/view/view_supp_invoice.php
+++ b/purchasing/view/view_supp_invoice.php
@@ -40,7 +40,7 @@ $supplier_curr_code = get_supplier_currency($supp_trans->supplier_id);
 display_heading(_("SUPPLIER INVOICE") . " # " . $trans_no);
 echo "<br>";
 
-start_table(TABLESTYLE, "width=95%");   
+start_table(TABLESTYLE, "width='95%'");
 start_row();
 label_cells(_("Supplier"), $supp_trans->supplier_name, "class='tableheader2'");
 label_cells(_("Reference"), $supp_trans->reference, "class='tableheader2'");
@@ -61,8 +61,8 @@ $total_grn = display_grn_items($supp_trans, 2);
 
 $display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec());
 
-start_table(TABLESTYLE, "width=95%");
-label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=15%");
+start_table(TABLESTYLE, "width='95%'");
+label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width='15%'");
 
 $tax_items = get_trans_tax_details(ST_SUPPINVOICE, $trans_no);
 display_supp_trans_tax_details($tax_items, 1);
diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index a23e8d71..ecdee25a 100644
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -47,7 +47,7 @@ echo "<center>";
 display_heading(_("Payment to Supplier") . " #$trans_no");
 
 echo "<br>";
-start_table(TABLESTYLE2, "width=80%");
+start_table(TABLESTYLE2, "width='80%'");
 
 start_row();
 label_cells(_("To Supplier"), $receipt['supplier_name'], "class='tableheader2'");
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index d9076691..80517758 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -78,7 +78,7 @@ class BoxReports
 				."$acc[1]>$acc[0]</a> <br>";
 
 			$style = $class_id==$cur_class ? '' : "style='display:none'";
-			$st_reports .= "<table class='repclass' id='TAB_" . $class_id ."' $style cellpadding=0 cellspacing=0 border=0 width='100%'><tr><td><b>" . _("Reports For Class: ") . "&nbsp;$name</b></td></tr>\n";
+			$st_reports .= "<table class='repclass' id='TAB_" . $class_id ."' $style cellpadding='0' cellspacing='0' border='0' width='100%'><tr><td><b>" . _("Reports For Class: ") . "&nbsp;$name</b></td></tr>\n";
 			foreach($this->ar_reports[$class_id] as $rep_id => $report)
 			{
 				$acc = access_string($report->name);
diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index 0db31150..a8f817bb 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -130,7 +130,7 @@ date_cells(_("Invoice date:"), 'date', '');
 end_row();
 end_table();
 
-start_table(TABLESTYLE, "width=70%");
+start_table(TABLESTYLE, "width='70%'");
 $th = array(_("Description"), _("Template No"),_("Customer"),_("Branch")."/"._("Group"),_("Days"),_("Monthly"),_("Begin"),_("End"),_("Last Created"),"");
 table_header($th);
 $k = 0;
diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 70148e81..cdd6ebe4 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -270,7 +270,7 @@ hidden('cart_id');
 $customer_error = display_credit_header($_SESSION['Items']);
 
 if ($customer_error == "") {
-	start_table(TABLESTYLE, "width=80%", 10);
+	start_table(TABLESTYLE, "width='80%'", 10);
 	echo "<tr><td>";
 	display_credit_items(_("Credit Note Items"), $_SESSION['Items']);
 	credit_options_controls($_SESSION['Items']);
diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index e74125ca..a1e274d1 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -227,10 +227,10 @@ function display_credit_items()
     start_form();
 	hidden('cart_id');
 
-	start_table(TABLESTYLE2, "width=80%", 5);
+	start_table(TABLESTYLE2, "width='80%'", 5);
 	echo "<tr><td>"; // outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
     start_row();
     label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 	label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -263,7 +263,7 @@ function display_credit_items()
 
     echo "</td><td>";// outer table
 
-    start_table(TABLESTYLE, "width=100%");
+    start_table(TABLESTYLE, "width='100%'");
 
     label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
 
@@ -276,7 +276,7 @@ function display_credit_items()
 	end_table(1); // outer table
 
 	div_start('credit_items');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
     	_("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
     table_header($th);
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 3c3c1800..1c575341 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -308,10 +308,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST
 start_form();
 hidden('cart_id');
 
-start_table(TABLESTYLE2, "width=80%", 5);
+start_table(TABLESTYLE2, "width='80%'", 5);
 echo "<tr><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 start_row();
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -360,7 +360,7 @@ end_table();
 
 echo "</td><td>";// outer table
 
-start_table(TABLESTYLE, "width=90%");
+start_table(TABLESTYLE, "width='90%'");
 
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
 	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']);
@@ -403,7 +403,7 @@ if ($row['dissallow_invoices'] == 1)
 }	
 display_heading(_("Delivery Items"));
 div_start('Items');
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 
 $new = $_SESSION['Items']->trans_no==0;
 $th = array(_("Item Code"), _("Item Description"), 
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index ea489879..f306c08c 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -379,7 +379,7 @@ $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['It
 start_form();
 hidden('cart_id');
 
-start_table(TABLESTYLE2, "width=80%", 5);
+start_table(TABLESTYLE2, "width='80%'", 5);
 
 start_row();
 $colspan = 1;
@@ -474,7 +474,7 @@ if ($row['dissallow_invoices'] == 1)
 display_heading(_("Invoice Items"));
 
 div_start('Items');
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
 	_("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 
@@ -528,9 +528,9 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 		if ($dn_line_cnt == 0) {
 			$dn_line_cnt = $dspans[0];
 			$dspans = array_slice($dspans, 1);
-			label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class=oddrow");
+			label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class='oddrow'");
 			label_cell("<a href='" . $_SERVER['PHP_SELF'] . "?RemoveDN=".
-				$ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class=oddrow");
+				$ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class='oddrow'");
 		}
 		$dn_line_cnt--;
 	}
diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index bf15289a..e32f5a8f 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -328,7 +328,7 @@ start_form();
 	hidden('trans_no');
 	hidden('old_ref', $old_ref);
 
-	start_outer_table(TABLESTYLE2, "width=60%", 5);
+	start_outer_table(TABLESTYLE2, "width='60%'", 5);
 
 	table_section(1);
 
@@ -388,7 +388,7 @@ start_form();
 	show_allocatable(false);
 	div_end();
 
-	start_table(TABLESTYLE, "width=60%");
+	start_table(TABLESTYLE, "width='60%'");
 
 	label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 07006fb6..ccc69d70 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -17,7 +17,7 @@ function display_credit_header(&$order)
 {
 	global $Ajax, $Refs;
 
-	start_outer_table(TABLESTYLE, "width=80%");
+	start_outer_table(TABLESTYLE, "width='80%'");
 	table_section(1);
 
 	$customer_error = "";
@@ -163,7 +163,7 @@ function display_credit_items($title, &$order)
 
     display_heading($title);
     div_start('items_table');
-    start_table(TABLESTYLE, "width=90%");
+    start_table(TABLESTYLE, "width='90%'");
     $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
 	_("Price"), _("Discount %"), _("Total"),'');
 
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 456f54f7..20509efc 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -141,7 +141,8 @@ function display_order_summary($title, &$order, $editable_items=false)
 	display_heading($title);
 
     div_start('items_table');
-	start_table(TABLESTYLE, "colspan=7 width=90%");
+	start_table(TABLESTYLE, "width='90%'");
+
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Delivered"),
 		_("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), "");
@@ -244,7 +245,7 @@ function display_order_header(&$order, $editable, $date_text)
 {
 	global $Ajax, $SysPrefs;
 
-	start_outer_table(TABLESTYLE2, "width=80%");
+	start_outer_table(TABLESTYLE2, "width='80%'");
 
 	table_section(1);
 	
@@ -376,6 +377,7 @@ function display_order_header(&$order, $editable, $date_text)
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
 	table_section(3);
+	start_row();
 	if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
 		 // editable payment type 
 		if (get_post('payment') !== $order->payment) {
@@ -398,6 +400,7 @@ function display_order_header(&$order, $editable, $date_text)
 	} else {
 		label_cells(_('Payment:'), $order->payment_terms['terms']);
 	}
+	end_row();
 
 	if($editable) {
 		$str = sales_types_list_row(_("Price List:"), 'sales_type', null, true);
@@ -570,7 +573,7 @@ function display_delivery_details(&$order)
 	if ($order->payment_terms['cash_sale']) {	// Direct payment sale
 		$Ajax->activate('items_table');
 		display_heading(_('Cash payment'));
-		start_table(TABLESTYLE2, "width=60%");
+		start_table(TABLESTYLE2, "width='60%'");
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
  		if (list_updated('Location'))
@@ -601,7 +604,7 @@ function display_delivery_details(&$order)
 			$delname = _("Required Delivery Date").':';
 		}
 		display_heading($title);
-		start_outer_table(TABLESTYLE2, "width=90%");
+		start_outer_table(TABLESTYLE2, "width='90%'");
 		table_section(1);
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 9fdd0276..1aa02aee 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -76,7 +76,7 @@ function display_customer_summary($customer_record)
 	$pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
 	$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
     	$pastdue1, $pastdue2, _("Total Balance"));
     table_header($th);
diff --git a/sales/manage/sales_areas.php b/sales/manage/sales_areas.php
index 4793ce7e..17cfa943 100644
--- a/sales/manage/sales_areas.php
+++ b/sales/manage/sales_areas.php
@@ -83,7 +83,7 @@ if ($Mode == 'RESET')
 $result = get_sales_areas(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array(_("Area Name"), "", "");
 inactive_control_column($th);
diff --git a/sales/manage/sales_groups.php b/sales/manage/sales_groups.php
index 60482ba3..2110515a 100644
--- a/sales/manage/sales_groups.php
+++ b/sales/manage/sales_groups.php
@@ -81,7 +81,7 @@ if ($Mode == 'RESET')
 $result = get_sales_groups(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 $th = array(_("ID"), _("Group Name"), "", "");
 inactive_control_column($th);
 
diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php
index 81c0dc26..0fd8e1d6 100644
--- a/sales/manage/sales_people.php
+++ b/sales/manage/sales_people.php
@@ -95,7 +95,7 @@ if ($Mode == 'RESET')
 $result = get_salesmen(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=60%");
+start_table(TABLESTYLE, "width='60%'");
 $th = array(_("Name"), _("Phone"), _("Fax"), _("Email"), _("Provision"), _("Break Pt."), _("Provision")." 2", "", "");
 inactive_control_column($th);
 table_header($th);
diff --git a/sales/manage/sales_types.php b/sales/manage/sales_types.php
index 1a5c1f61..f356b4e4 100644
--- a/sales/manage/sales_types.php
+++ b/sales/manage/sales_types.php
@@ -98,7 +98,7 @@ if ($Mode == 'RESET')
 $result = get_all_sales_types(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 
 $th = array (_('Type Name'), _('Factor'), _('Tax Incl'), '','');
 inactive_control_column($th);
diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 3873d4a5..f9933b31 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -716,7 +716,7 @@ $customer_error = display_order_header($_SESSION['Items'],
 	($_SESSION['Items']->any_already_delivered() == 0), $idate);
 
 if ($customer_error == "") {
-	start_table(TABLESTYLE, "width=80%", 10);
+	start_table(TABLESTYLE, "width='80%'", 10);
 	echo "<tr><td>";
 	display_order_summary($orderitems, $_SESSION['Items'], true);
 	echo "</td></tr>";
diff --git a/sales/view/view_credit.php b/sales/view/view_credit.php
index 4291d9dc..7fba678b 100644
--- a/sales/view/view_credit.php
+++ b/sales/view/view_credit.php
@@ -39,11 +39,11 @@ $branch = get_branch($myrow["branch_code"]);
 display_heading("<font color=red>" . sprintf(_("CREDIT NOTE #%d"), $trans_id). "</font>");
 echo "<br>";
 
-start_table(TABLESTYLE2, "width=95%");
+start_table(TABLESTYLE2, "width='95%'");
 echo "<tr valign=top><td>"; // outer table
 
 /*Now the customer charged to details in a sub table*/
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Customer"));
 table_header($th);
 
@@ -54,7 +54,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Branch"));
 table_header($th);
 
@@ -63,7 +63,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 start_row();
 label_cells(_("Ref"), $myrow["reference"], "class='tableheader2'");
 label_cells(_("Date"), sql2date($myrow["tran_date"]), "class='tableheader2'");
@@ -83,7 +83,7 @@ $sub_total = 0;
 
 $result = get_customer_trans_details(ST_CUSTCREDIT, $trans_id);
 
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 
 if (db_num_rows($result) > 0)
 {
@@ -134,7 +134,7 @@ $display_total = price_format($credit_total);
 /*Print out the invoice text entered */
 if ($sub_total != 0)
 	label_row(_("Sub Total"), $display_sub_tot, "colspan=6 align=right",
-		"nowrap align=right width=15%");
+		"nowrap align=right width='15%'");
 label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
 
 $tax_items = get_trans_tax_details(ST_CUSTCREDIT, $trans_id);
diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 7ed8c304..d089282b 100644
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -43,11 +43,11 @@ $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 display_heading(sprintf(_("DISPATCH NOTE #%d"),$trans_id));
 
 echo "<br>";
-start_table(TABLESTYLE2, "width=95%");
+start_table(TABLESTYLE2, "width='95%'");
 echo "<tr valign=top><td>"; // outer table
 
 /*Now the customer charged to details in a sub table*/
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Charge To"));
 table_header($th);
 
@@ -61,7 +61,7 @@ echo "</td><td>"; // outer table
 
 /*end of the main table showing the company name and charge to details */
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Charge Branch"));
 table_header($th);
 
@@ -70,7 +70,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Delivered To"));
 table_header($th);
 
@@ -80,7 +80,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 start_row();
 label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
 label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
@@ -105,7 +105,7 @@ end_table(1); // outer table
 
 $result = get_customer_trans_details(ST_CUSTDELIVERY, $trans_id);
 
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 
 if (db_num_rows($result) > 0)
 {
@@ -144,7 +144,7 @@ if (db_num_rows($result) > 0)
 	} //end while there are line items to print out
 	$display_sub_tot = price_format($sub_total);
 	label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
-		"nowrap align=right width=15%");
+		"nowrap align=right width='15%'");
 
 }
 else
diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index d6a6cb7a..2d128a51 100644
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -43,11 +43,11 @@ $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
 
 echo "<br>";
-start_table(TABLESTYLE2, "width=95%");
+start_table(TABLESTYLE2, "width='95%'");
 echo "<tr valign=top><td>"; // outer table
 
 /*Now the customer charged to details in a sub table*/
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Charge To"));
 table_header($th);
 
@@ -61,7 +61,7 @@ echo "</td><td>"; // outer table
 
 /*end of the main table showing the company name and charge to details */
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Charge Branch"));
 table_header($th);
 
@@ -70,7 +70,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 $th = array(_("Payment Terms"));
 table_header($th); 
 $paym = get_payment_terms($myrow['payment_terms']);
@@ -79,7 +79,7 @@ end_table();
 
 echo "</td><td>"; // outer table
 
-start_table(TABLESTYLE, "width=100%");
+start_table(TABLESTYLE, "width='100%'");
 start_row();
 label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
 label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
@@ -106,7 +106,7 @@ end_table(1); // outer table
 
 $result = get_customer_trans_details(ST_SALESINVOICE, $trans_id);
 
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 
 if (db_num_rows($result) > 0)
 {
@@ -146,7 +146,7 @@ if (db_num_rows($result) > 0)
 
 	$display_sub_tot = price_format($sub_total);
 	label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
-		"nowrap align=right width=15%");
+		"nowrap align=right width='15%'");
 }
 else
 	display_note(_("There are no line items on this invoice."), 1, 2);
diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 09e9e51e..a96f2f7b 100644
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -33,7 +33,7 @@ $receipt = get_customer_trans($trans_id, ST_CUSTPAYMENT);
 display_heading(sprintf(_("Customer Payment #%d"),$trans_id));
 
 echo "<br>";
-start_table(TABLESTYLE, "width=80%");
+start_table(TABLESTYLE, "width='80%'");
 start_row();
 label_cells(_("From Customer"), $receipt['DebtorName'], "class='tableheader2'");
 label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'");
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 6790f20d..3276b958 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -41,7 +41,7 @@ if (isset($_SESSION['View']))
 
 $_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no']);
 
-start_table(TABLESTYLE2, "width=95%", 5);
+start_table(TABLESTYLE2, "width='95%'", 5);
 
 if ($_GET['trans_type'] != ST_SALESQUOTE)
 {
@@ -56,7 +56,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 echo "<tr valign=top><td>";
 
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
 label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
 	"colspan=3");
 start_row();
@@ -197,7 +197,7 @@ if ($_SESSION['View']->so_type == 1)
 	display_note(_("This Sales Order is used as a Template."), 0, 0, "class='currentfg'");
 display_heading2(_("Line Details"));
 
-start_table(TABLESTYLE, "colspan=9 width=95%");
+start_table(TABLESTYLE, "width='95%'");
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
 	_("Price"), _("Discount"), _("Total"), _("Quantity Delivered"));
 table_header($th);
diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php
index ce94cfe4..f2d9b063 100644
--- a/taxes/item_tax_types.php
+++ b/taxes/item_tax_types.php
@@ -113,7 +113,7 @@ if ($Mode == 'RESET')
 $result2 = $result = get_all_item_tax_types(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=30%");
+start_table(TABLESTYLE, "width='30%'");
 $th = array(_("Name"), _("Tax exempt"),'','');
 inactive_control_column($th);
 table_header($th);
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 1d03c5d9..40b7f7ea 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -19,7 +19,7 @@
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
-			return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+			return "<img src='$path_to_root/themes/aqua/images/$img' style='vertical-align:middle;' border='0' ".basename($img).">&nbsp;&nbsp;";
 		}
 
 		function wa_header()
@@ -51,8 +51,8 @@
 				$local_path_to_root = $path_to_root;
 
 				$sel_app = $_SESSION['sel_app'];
-				echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-				echo "<div class=tabs>";
+				echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
+				echo "<div class='tabs'>";
 				foreach($applications as $app)
 				{
                     if ($_SESSION["wa_current_user"]->check_application_access($app))
@@ -70,10 +70,10 @@
 				$img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
 				$himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 
-				echo "<table class=logoutBar>";
-				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+				echo "<table class='logoutBar'>";
+				echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
 				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -110,17 +110,17 @@
 			if ($no_menu == false)	// bottom status line
 			{
 				if ($is_index)
-					echo "<table class=bottomBar>\n";
+					echo "<table class='bottomBar'>\n";
 				else
-					echo "<table class=bottomBar2>\n";
+					echo "<table class='bottomBar2'>\n";
 				echo "<tr>";
 				if (isset($_SESSION['wa_current_user'])) {
 					$phelp = implode('; ', $Pagehelp);
-					echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+					echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
 					$Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
-					echo "<td id='hotkeyshelp'>".$phelp."</td>";
+					echo "<td id='hotkeyshelp'>".$phelp.'</td>';
 				}
-				echo "</td></tr></table>\n";
+				echo "</tr></table>\n";
 			}
 			echo "</td></tr> </table>\n"; // 'callout_main'
 			if ($no_menu == false)
@@ -157,7 +157,7 @@
 				return;
 			}
 
-			echo "<table width=100% cellpadding='0' cellspacing='0'>";
+			echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 			foreach ($selected_app->modules as $module)
 			{
         		if (!$_SESSION["wa_current_user"]->check_module_access($module))
diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index 1e597b26..fcf9a8dc 100644
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -51,8 +51,8 @@
 				$local_path_to_root = $path_to_root;
 
 				$sel_app = $_SESSION['sel_app'];
-				echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-				echo "<div class=tabs>";
+				echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
+				echo "<div class='tabs'>";
 				foreach($applications as $app)
 				{
                     if ($_SESSION["wa_current_user"]->check_application_access($app))
@@ -70,10 +70,10 @@
 				$img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
 				$himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
 
-				echo "<table class=logoutBar>";
-				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+				echo "<table class='logoutBar'>";
+				echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
 				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='middle' style='visibility:hidden;'></td>";
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -109,17 +109,17 @@
 			if ($no_menu == false)	// bottom status line
 			{
 				if ($is_index)
-					echo "<table class=bottomBar>\n";
+					echo "<table class='bottomBar'>\n";
 				else
-					echo "<table class=bottomBar2>\n";
+					echo "<table class='bottomBar2'>\n";
 				echo "<tr>";
 				if (isset($_SESSION['wa_current_user'])) {
 					$phelp = implode('; ', $Pagehelp);
-					echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+					echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
 					$Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
 					echo "<td id='hotkeyshelp'>".$phelp."</td>";
 				}
-				echo "</td></tr></table>\n";
+				echo "</tr></table>\n";
 			}
 			echo "</td></tr> </table>\n"; // 'callout_main'
 			if ($no_menu == false)
@@ -134,7 +134,7 @@
 				if ($allow_demo_mode==true)
 				{
 					echo "<tr>\n";
-					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
+					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
 					echo "</tr>\n";
 				}
 				echo "</table><br><br>\n";
@@ -155,7 +155,7 @@
 				return;
 			}
 
-			echo "<table width=100% cellpadding='0' cellspacing='0'>";
+			echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 			foreach ($selected_app->modules as $module)
 			{
         		if (!$_SESSION["wa_current_user"]->check_module_access($module))
diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index ae0cb59e..252dbfb8 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -20,7 +20,7 @@
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
-			return "<img src='$path_to_root/themes/default/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+			return "<img src='$path_to_root/themes/default/images/$img' style='vertical-align:middle;' border='0' ".basename($img).">&nbsp;&nbsp;";
 		}
 
 		function wa_header()
@@ -51,8 +51,8 @@
 				$applications = $_SESSION['App']->applications;
 				$local_path_to_root = $path_to_root;
 				$sel_app = $_SESSION['sel_app'];
-				echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-				echo "<div class=tabs>";
+				echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
+				echo "<div class='tabs'>";
 				foreach($applications as $app)
 				{
                     if ($_SESSION["wa_current_user"]->check_application_access($app))
@@ -69,10 +69,10 @@
 				// top status bar
 				$img = "<img src='$local_path_to_root/themes/default/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
 				$himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
-				echo "<table class=logoutBar>";
-				echo "<tr><td class=headingtext3>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+				echo "<table class='logoutBar'>";
+				echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
 				$indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+				echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='middle' style='visibility:hidden;' alt='ajaxmark'></td>";
 				echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
 				echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
@@ -108,20 +108,19 @@
 			if ($no_menu == false) // bottom status line
 			{
 				if ($is_index)
-					echo "<table class=bottomBar>\n";
+					echo "<table class='bottomBar'>\n";
 				else
-					echo "<table class=bottomBar2>\n";
+					echo "<table class='bottomBar2'>\n";
 				echo "<tr>";
 				if (isset($_SESSION['wa_current_user'])) {
 					$phelp = implode('; ', $Pagehelp);
-					echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+					echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
 					$Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
 					echo "<td id='hotkeyshelp'>".$phelp."</td>";
 				}
-				echo "</td></tr></table>\n";
+				echo "</tr></table>\n";
 			}
 			echo "</td></tr> </table>\n"; // 'callout_main'
-			echo "</table>\n";
 			if ($no_menu == false)
 			{
 				echo "<table align='center' id='footer'>\n";
@@ -155,7 +154,7 @@
 				return;
 			}
 
-			echo "<table width=100% cellpadding='0' cellspacing='0'>";
+			echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 			foreach ($selected_app->modules as $module)
 			{
         		if (!$_SESSION["wa_current_user"]->check_module_access($module))
-- 
2.30.2