diff --git a/ChangeLog b/ChangeLog
index 6b87e0983..5c500afac 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,9 +19,11 @@ $Source$
       - bug #1348189 after droping db some links in main.php are missing
     * header.inc.php, libraries/common.lib.php:
       - added class icon to img-tags
-    * header_meta_style.inc.php:
+    * libraries/header_meta_style.inc.php:
       fixed position of link meta tag
-
+    * libraries/select_server.lib.php
+      fixed html output
+      
 2005-11-03 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php, tbl_replace.php, tbl_replace_fields.php:
       bug #1339184, problems in strict mode inserting auto-increment fields
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 0d7c5698e..b56008c39 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -5,29 +5,19 @@
  */
 
 if (count($cfg['Servers']) > 1) {
-    if (!$cfg['DisplayServersList']) {
-    ?>
-    <form method="post" action="index.php" target="_parent" style="margin: 0px; padding: 0px;">
-    <?php
-    }
     if ($show_server_left) {
         echo '<div class="heada">' . $strServer . ':</div>';
     } else {
-    ?>
-<!-- MySQL servers choice form -->
-<table border="0" cellpadding="3" cellspacing="0" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-    <tr>
-        <th class="tblHeaders"><?php echo $strServerChoice; ?></th>
-    </tr>
-    <tr>
-        <td>
-    <?php
+        ?> 
+<fieldset>
+<legend><?php echo $strServerChoice; ?></legend>
+        <?php
     }
     if (!$cfg['DisplayServersList']) {
-    ?>
-    <form method="post" action="index.php" target="_parent" style="margin: 0px; padding: 0px;">
+        ?> 
+    <form method="post" action="index.php" target="_parent">
         <select name="server" onchange="this.form.submit();">
-    <?php
+        <?php
     }
     foreach ($cfg['Servers'] AS $key => $val) {
         if (!empty($val['host'])) {
@@ -60,30 +50,29 @@ if (count($cfg['Servers']) > 1) {
                     echo '&raquo; <a class="item" href="index.php?server=' . $key . '&amp;lang=' . $lang . '&amp;convcharset=' . $convcharset . '" target="_top">' . $label . '</a><br />';
                 }
             } else {
-                echo '                <option value="' . $key . '" ' . ($selected ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+                echo '            <option value="' . $key . '" ' . ($selected ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
             }
 
         } // end if (!empty($val['host']))
     } // end while
 
-    if (!$cfg['DisplayServersList']){
-?>
+    if ( ! $cfg['DisplayServersList'] ) {
+        ?> 
         </select>
         <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
         <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
+        <noscript>
         <input type="submit" value="<?php echo $strGo; ?>" />
+        </noscript>
     </form>
-<?php
+        <?php
     }
     if (!$show_server_left) {
-    ?>
-        </td>
-    </tr>
-</table>
-<br />
-<?php
+        ?> 
+</fieldset>
+        <?php
     } else {
-        echo '<hr />' . "\n";
+        echo '<hr />';
     }
 }
-?>
+?>