diff --git a/index.php b/index.php
index caa8967d82..271c807ad2 100755
--- a/index.php
+++ b/index.php
@@ -109,12 +109,12 @@
      }
   }
 ?>
- <script langague="JavaScript">
+ <SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
     function opennotifywindow()
     {
       window.open("<?php echo $phpgw->link("notify.php")?>", "phpGroupWare", "width=150,height=25,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=yes");
     }
- </script>
+ </SCRIPT>
 
 <?php
   echo '<p><table border="0" width="100%" align="center">';
diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index 011023f502..2a9023304b 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -221,7 +221,6 @@
       if (! $url) {
         $url_root = split ("/", $phpgw_info["server"]["webserver_url"]);
         $url = $url_root[0]."//".$url_root[2].$PHP_SELF;
-	$url = $PHP_SELF;
       }
 
       if (isset($phpgw_info["server"]["usecookies"]) &&
diff --git a/phpgwapi/templates/default/footer.tpl b/phpgwapi/templates/default/footer.tpl
index cbafdc3aef..954f6c42ae 100644
--- a/phpgwapi/templates/default/footer.tpl
+++ b/phpgwapi/templates/default/footer.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN footer -->
 <P>
-<table border="0" cellspacing="0" cellpading="0" width="100%" bgcolor="{table_bg_color}">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="{table_bg_color}">
   <TR>
     <TD align="center">{msg}<br></TD>
   </TR>
diff --git a/phpgwapi/templates/default/navbar.tpl b/phpgwapi/templates/default/navbar.tpl
index a57a8f3113..4b0d631053 100644
--- a/phpgwapi/templates/default/navbar.tpl
+++ b/phpgwapi/templates/default/navbar.tpl
@@ -5,7 +5,6 @@
   <td align="left">&nbsp;</td>
   {applications}  
  </tr>
- <tr>
 </table>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
  <tr>
diff --git a/phpgwapi/templates/verdilak/footer.tpl b/phpgwapi/templates/verdilak/footer.tpl
index 24517d9e3f..c707731654 100644
--- a/phpgwapi/templates/verdilak/footer.tpl
+++ b/phpgwapi/templates/verdilak/footer.tpl
@@ -4,7 +4,7 @@
   </tr>
 </table>
 
-<table border="0" cellspacing="0" cellpading="0" width="100%" bgcolor="{table_bg_color}">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="{table_bg_color}">
  <tr>
   <td background="{img_root}/bg_filler.gif">&nbsp;</td>
  </tr>
diff --git a/phpgwapi/templates/verdilak/head.inc.php b/phpgwapi/templates/verdilak/head.inc.php
index 239819cb4e..a4411f7b2b 100644
--- a/phpgwapi/templates/verdilak/head.inc.php
+++ b/phpgwapi/templates/verdilak/head.inc.php
@@ -11,10 +11,9 @@
 
   /* $Id$ */
 
-    if ($phpgw_info["server"]["htmlcompliant"]) {
-      $bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\" ALINK=\"".$phpgw_info["theme"]["alink"]."\" LINK=\"".$phpgw_info["theme"]["link"]."\" VLINK=\"".$phpgw_info["theme"]["vlink"]."\"";
-    } else {
-	    $bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\"";
+    $bodyheader = "BGCOLOR=\"".$phpgw_info["theme"]["bg_color"]."\" ALINK=\"".$phpgw_info["theme"]["alink"]."\" LINK=\"".$phpgw_info["theme"]["link"]."\" VLINK=\"".$phpgw_info["theme"]["vlink"]."\"";
+    if (!$phpgw_info["server"]["htmlcompliant"]) {
+      $bodyheader .= "topmargin=\"0\" marginheight=\"0\" marginwidth=\"0\" leftmargin=\"0\"";
     }
 
     $tpl = new Template($phpgw_info["server"]["template_dir"]);
diff --git a/phpgwapi/templates/verdilak/navbar.tpl b/phpgwapi/templates/verdilak/navbar.tpl
index 8c1eff16a6..45bd3b1e6f 100755
--- a/phpgwapi/templates/verdilak/navbar.tpl
+++ b/phpgwapi/templates/verdilak/navbar.tpl
@@ -2,17 +2,12 @@
 <!-- BEGIN navbar -->
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="{table_bg_color}">
-
- <tr background="{img_root}/bg_filler.gif">
-  <td align="left" valign="bottom"><a href="http://www.phpgroupware.org" target="_new"><img src="{img_root}/logo.gif" height="32" width="123" border="0"></a></td>
-  <td align="center" valign="bottom" width="100%"><font color="FFFFFF" size="-1">{user_info}</font></td>
-  <td align="right" valign="bottom" rowspan="2"><a href="{home_link}"><img src="{welcome_img}" border="0"></a><a href="{preferences_link}"><img src="{preferences_img}" border="0"></a><a href="{logout_link}"><img src="{logout_img}" border="0"></a><a href="{help_link}"><img src="{img_root}/help.gif" border="0"></a></td>
- </tr>
-
- <tr background="{img_root}/bg_filler.gif">
-  <td align="center" width="100%" valign="bottom" colspan="2"><img src="{img_root}/greybar.gif" height="6"  width="100%"></td>
- </tr>
-
+<tr background="{img_root}/bg_filler.gif">
+<td align="left" valign="bottom"><a href="http://www.phpgroupware.org" target="_new"><img src="{img_root}/logo.gif" height="32" width="123" border="0" alt="phpGroupWare"></a></td>
+<td align="center" valign="bottom" width="100%"><font color="FFFFFF" size="-1">{user_info}</font></td>
+<td align="right" valign="bottom" rowspan="2"><a href="{home_link}"><img src="{welcome_img}" border="0" alt="Welcome"></a><a href="{preferences_link}"><img src="{preferences_img}" border="0" alt="Preferences"></a><a href="{logout_link}"><img src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img src="{img_root}/help.gif" border="0" alt="Help"></a></td></tr>
+<tr background="{img_root}/bg_filler.gif">
+<td align="center" width="100%" valign="bottom" colspan="2"><img src="{img_root}/greybar.gif" height="6"  width="100%" alt="bar"></td></tr>
 </table>
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%">