diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 4ed94b0fd..942982b95 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -441,6 +441,7 @@ sub setHelp {
 	my $self = shift;
 	my $id = shift;
 	my $namespace = shift || "WebGUI";
+	$id =~ s/ /%20/g;
 	$self->{_helpUrl} = WebGUI::URL::page('op=viewHelp;hid='.$id.';namespace='.$namespace) if ($id);
 }
 
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 186650eb2..863aed706 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -421,7 +421,7 @@ sub _drawQueryBuilder {
 	$output .= '<link href="'.$session{config}{extrasURL}.
 			'/wobject/Shortcut/querybuilder.css" type="text/css" rel="stylesheet">';
 
-	$output .= qq|<table cellspacing="0" cellpadding=0 border=0 >
+	$output .= qq|<table cellspacing="0" cellpadding="0" border="0">
 			  <tr>
 			    <td colspan="5" align="right">$shortcutCriteriaField</td>
 			  </tr>
diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm
index 88a81ae4d..15907ac15 100644
--- a/lib/WebGUI/Operation/ActiveSessions.pm
+++ b/lib/WebGUI/Operation/ActiveSessions.pm
@@ -49,7 +49,7 @@ sub www_viewActiveSessions {
 	$sth->finish;
 	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=viewActiveSessions'));
 	$p->setDataByArrayRef(\@row);
-        $output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
+        $output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
         $output .= '<tr class="tableHeader"><td>'.WebGUI::International::get(428).'</td>';
         $output .= '<td>'.WebGUI::International::get(435).'</td>';
         $output .= '<td>'.WebGUI::International::get(432).'</td>';
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 88ba8c7be..878794795 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -445,7 +445,7 @@ sub www_editCommerceSettings {
 		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@paymentPlugins) {
 			$tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
-				'<table border=0 cellspacing=0 cellpadding=0  width="100%">'.
+				'<table border="0" cellspacing="0" cellpadding="0" width="100%">'.
 				$currentPlugin->configurationForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
 			$jscript .= "document.getElementById(\"".$currentPlugin->namespace."\").style.display='".(($currentPlugin->namespace eq $paymentPlugin)?"":"none")."';";
 		}
@@ -486,7 +486,7 @@ sub www_editCommerceSettings {
 		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@shippingPlugins) {
 			$tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
-				'<table border=0 cellspacing=0 cellpadding=0  width="100%">'.
+				'<table border="0" cellspacing="0" cellpadding="0" width="100%">'.
 				$currentPlugin->configurationForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
 			$jscript .= "document.getElementById(\"".$currentPlugin->namespace."\").style.display='".(($currentPlugin->namespace eq $shippingPlugin)?"":"none")."';";
 		}
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index fe64ae280..a3d461890 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -161,7 +161,7 @@ sub www_listDatabaseLinks {
 	$sth->finish;
         $p = WebGUI::Paginator->new(WebGUI::URL::page('op=listDatabaseLinks'));
 	$p->setDataByArrayRef(\@row);
-        $output .= '<table border=1 cellpadding=3 cellspacing=0 align="center">';
+        $output .= '<table border="1" cellpadding="3" cellspacing="0" align="center">';
         $output .= $p->getPage;
         $output .= '</table>';
         $output .= $p->getBarTraditional;
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index d28e0a08f..ebe9a9932 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -515,7 +515,7 @@ sub www_listGroups {
 		my $output = getGroupSearchForm("listGroups");
 		my ($groupCount) = WebGUI::SQL->quickArray("select count(*) from groups where isEditable=1");
         	return _submenu($output) unless ($session{form}{doit} || $groupCount<250 || $session{form}{pn} > 1);
-		$output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
+		$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 		$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(84).'</td><td class="tableHeader">'
 			.WebGUI::International::get(85).'</td><td class="tableHeader">'
 			.WebGUI::International::get(748).'</td></tr>';
@@ -552,7 +552,7 @@ sub www_listGroups {
         	$sth->finish;
         	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=listGroups'));
         	$p->setDataByArrayRef(\@row);
-        	$output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
+        	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
         	$output .= '<tr><td class="tableHeader">'.WebGUI::International::get(84).'</td><td class="tableHeader">'
                 	.WebGUI::International::get(85).'</td><td class="tableHeader">'
                 	.WebGUI::International::get(748).'</td></tr>';
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index 06c0b6823..52b946bc5 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -240,7 +240,7 @@ sub www_listLDAPLinks {
    $sth->finish;
    $p = WebGUI::Paginator->new(WebGUI::URL::page('op=listLDAPLinks'));
    $p->setDataByArrayRef(\@row);
-   $output .= '<table border=1 cellpadding=3 cellspacing=0 align="center">';
+   $output .= '<table border="1" cellpadding="3" cellspacing="0" align="center">';
    $output .= $p->getPage;
    $output .= '</table>';
    $output .= $p->getBarTraditional;
diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm
index cef1246f0..003130f0a 100644
--- a/lib/WebGUI/Operation/LoginHistory.pm
+++ b/lib/WebGUI/Operation/LoginHistory.pm
@@ -39,7 +39,7 @@ sub www_viewLoginHistory {
 	$sth->finish;
 	$p = WebGUI::Paginator->new(WebGUI::URL::page('op=viewLoginHistory'));
 	$p->setDataByArrayRef(\@row);
-	$output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
+	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	$output .= '<tr class="tableHeader"><td>'.WebGUI::International::get(428).'</td>';
 	$output .= '<td>'.WebGUI::International::get(434).'</td>';
 	$output .= '<td>'.WebGUI::International::get(429).'</td>';
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 84b17f84b..b393b6e0b 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -285,7 +285,7 @@ sub www_editSettings {
 	my $jscript = '<script type="text/javascript">';
 	foreach (@{$session{config}{authMethods}}) {
 		my $authInstance = WebGUI::Operation::Auth::getInstance($_,1);
-		$tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border=0 cellspacing=0 cellpadding=0  width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
+		$tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
 		$jscript .= "document.getElementById(\"$_\").style.display='".(($_ eq $session{setting}{authMethod})?"":"none")."';";
 	}
 	$jscript .= "</script>";	
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 74ad35b2c..15189f328 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -459,7 +459,7 @@ sub www_listUsers {
 		Deactivated	=> WebGUI::International::get(818),
 		Selfdestructed	=> WebGUI::International::get(819)
 	);
-        $output .= '<table border=1 cellpadding=5 cellspacing=0 align="center">';
+        $output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
         $output .= '<tr>
                 <td class="tableHeader">'.WebGUI::International::get(816).'</td>
                 <td class="tableHeader">'.WebGUI::International::get(50).'</td>