diff --git a/ChangeLog b/ChangeLog
index 55658a447..171a642e4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-02-17 Marc Delisle  <lem9@users.sourceforge.net>
+    * header.inc.php, queryframe.php: HTML improvement, 
+      thanks to Armel Fauveau
+
 2005-02-16 Alexander M. Turek  <me@derrabus.de>
     * db_details_export.php: Views are not exportable yet.
 	* themes/*/css/theme_right.css.php: Allow to mark a whole row as disabled.
diff --git a/header.inc.php b/header.inc.php
index 144532f8e..fe75cf84e 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -64,7 +64,7 @@ if (empty($GLOBALS['is_header_sent'])) {
 
     document.write('<style type="text/css">');
     document.write('img.lightbulb { cursor: pointer; }');
-    document.write('</style>');
+    document.write('<\/style>');
     
     <?php
     // Add some javascript instructions if required
diff --git a/queryframe.php b/queryframe.php
index 79bb9e2ec..289ee86f7 100644
--- a/queryframe.php
+++ b/queryframe.php
@@ -225,7 +225,7 @@ if ($cfg['MainPageIconic']) {
     ?>
     <script type="text/javascript">
     <!--
-    document.writeln('<a href="<?php echo $href; ?>" <?php echo $target . ' ' . $onclick; ?> class="item"><?php echo addslashes($query_frame_link_text); ?></a>');
+    document.writeln('<a href="<?php echo $href; ?>" <?php echo $target . ' ' . $onclick; ?> class="item"><?php echo addslashes($query_frame_link_text); ?><\/a>');
     //-->
     </script>
     <noscript>
@@ -291,14 +291,13 @@ if ($num_dbs > 1) {
         </tr>
         <tr>
             <td nowrap="nowrap">
+    <form method="post" action="index.php" name="left" target="_parent" style="margin: 0px; padding: 0px;">
     <script type="text/javascript" language="javascript">
     <!--
-        document.writeln('<form method="post" action="left.php" name="left" target="nav" style="margin: 0px; padding: 0px;">');
+        document.left.action="left.php";
+        document.left.target="nav";
     //-->
     </script>
-    <noscript>
-        <form method="post" action="index.php" name="left" target="_parent" style="margin: 0px; padding: 0px;">
-    </noscript>
     <?php
         echo PMA_generate_common_hidden_inputs();
         echo '        <input type="hidden" name="hash" value="' . $hash . '" />' . "\n";
@@ -394,8 +393,10 @@ if ($num_dbs > 1) {
         } // end for $i (db list)
         ?>
         </select>
-        <noscript><input type="submit" name="Go" value="<?php echo $strGo; ?>" /></noscript>
-    </form>
+        <noscript>
+            <input type="submit" name="Go" value="<?php echo $strGo; ?>" />
+        </noscript>
+        </form>
             </td>
         </tr>
     </table>