diff --git a/ChangeLog b/ChangeLog
index fffe6618a..cb1f696a0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@ $Source$
       - moved styles into css
       - no need for javascript
     * relation.lib.php: uninitialized variable
+    * tbl_select.php, css/phpmyadmin.css.php:
+      - moved styles into css
+      - minor code improvements
 
 2005-11-23 Michal Čihař  <michal@cihar.com>
     * config.default.php, libraries/import/csv.php, libraries/import/ldi.php:
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index f4e175979..87ba64419 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -646,6 +646,9 @@ img.lightbulb {
     border: 0.1em solid red;
 }
 
+#fieldset_select_fields {
+    float: left;
+}
 <?php
 
 $_valid_css = array( 'left', 'right', 'print' );
diff --git a/tbl_select.php b/tbl_select.php
index 9a7b944d0..3911cf334 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -10,23 +10,17 @@ require_once('./libraries/common.lib.php');
 require_once('./libraries/relation.lib.php'); // foreign keys
 require_once('./libraries/mysql_charsets.lib.php');
 
-if ($cfg['PropertiesIconic'] == true) {
-    // We need to copy the value or else the == 'both' check will always return true
-    $propicon = (string)$cfg['PropertiesIconic'];
+if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) {
+    $titles['Browse'] =
+        '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
+        .'b_browse.png" alt="' . $strBrowseForeignValues . '" title="'
+        .$strBrowseForeignValues . '" />';
 
-    if ($propicon == 'both') {
-        $iconic_spacer = '<div class="nowrap">';
-    } else {
-        $iconic_spacer = '';
-    }
-
-    $titles['Browse']     = $iconic_spacer . '<img width="16" height="16" src="' . $pmaThemeImage . 'b_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />';
-
-    if ($propicon == 'both') {
-        $titles['Browse']        .= '&nbsp;' . $strBrowseForeignValues . '</div>';
+    if ($GLOBALS['cfg']['PropertiesIconic'] === 'both') {
+        $titles['Browse'] .= $strBrowseForeignValues;
     }
 } else {
-    $titles['Browse']        = $strBrowseForeignValues;
+    $titles['Browse'] = $strBrowseForeignValues;
 }
 
 /**
@@ -49,14 +43,14 @@ if (!isset($param) || $param[0] == '') {
     require_once('./tbl_properties_links.php');
 
     if (!isset($goto)) {
-        $goto = $cfg['DefaultTabTable'];
+        $goto = $GLOBALS['cfg']['DefaultTabTable'];
     }
     // Defines the url to return to in case of error in the next sql statement
     $err_url   = $goto . '?' . PMA_generate_common_url($db, $table);
 
     // Gets the list and number of fields
-    $result    = PMA_DBI_query('SHOW' . (PMA_MYSQL_INT_VERSION >= 40100 ? ' FULL' : '') . ' FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE);
-    $fields_cnt        = PMA_DBI_num_rows($result);
+    $result     = PMA_DBI_query('SHOW' . (PMA_MYSQL_INT_VERSION >= 40100 ? ' FULL' : '') . ' FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE);
+    $fields_cnt = PMA_DBI_num_rows($result);
     // rabue: we'd better ensure, that all arrays are empty.
     $fields_list = $fields_null = $fields_type = $fields_collation = array();
     while ($row = PMA_DBI_fetch_assoc($result)) {
@@ -65,21 +59,21 @@ if (!isset($param) || $param[0] == '') {
         // reformat mysql query output - staybyte - 9. June 2001
         if (strncasecmp($type, 'set', 3) == 0
             || strncasecmp($type, 'enum', 4) == 0) {
-            $type      = str_replace(',', ', ', $type);
+            $type = str_replace(',', ', ', $type);
         } else {
 
-        // strip the "BINARY" attribute, except if we find "BINARY(" because
-        // this would be a BINARY or VARBINARY field type
+            // strip the "BINARY" attribute, except if we find "BINARY(" because
+            // this would be a BINARY or VARBINARY field type
             if (!preg_match('@BINARY[\(]@i', $type)) {
-                $type         = preg_replace('@BINARY@i', '', $type);
+                $type = preg_replace('@BINARY@i', '', $type);
             }
-            $type         = preg_replace('@ZEROFILL@i', '', $type);
-            $type         = preg_replace('@UNSIGNED@i', '', $type);
+            $type = preg_replace('@ZEROFILL@i', '', $type);
+            $type = preg_replace('@UNSIGNED@i', '', $type);
 
             $type = strtolower($type);
         }
         if (empty($type)) {
-            $type      = '&nbsp;';
+            $type = '&nbsp;';
         }
         $fields_null[] = $row['Null'];
         $fields_type[] = $type;
@@ -99,14 +93,14 @@ if (!isset($param) || $param[0] == '') {
     $foreigners  = PMA_getForeigners($db, $table);
     ?>
 <script language="JavaScript" type="text/javascript">
-<!--
+// <![CDATA[
 function PMA_tbl_select_operator(f, index, multiple) {
     switch (f.elements["func[" + index + "]"].options[f.elements["func[" + index + "]"].selectedIndex].value) {
 <?php
-        reset($GLOBALS['cfg']['UnaryOperators']);
-        while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
-            echo '        case "' . $operator . "\":\r\n";
-        }
+reset( $GLOBALS['cfg']['UnaryOperators'] );
+while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
+    echo '        case "' . $operator . "\":\r\n";
+}
 ?>
             bDisabled = true;
             break;
@@ -116,156 +110,128 @@ function PMA_tbl_select_operator(f, index, multiple) {
     }
     f.elements["fields[" + index + "]" + ((multiple) ? "[]": "")].disabled = bDisabled;
 }
-// -->
+// ]]>
 </script>
 <form method="post" action="tbl_select.php" name="insertForm">
-    <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
-    <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
-    <input type="hidden" name="back" value="tbl_select.php" />
-    <table border="0" cellpadding="0" cellspacing="0">
-        <tr>
-            <td valign="top">
-                <table border="0" cellpadding="3" cellspacing="0">
-                    <tr>
-                        <th align="left" colspan="2">
-                            <?php echo $strSelectFields; ?>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-                            <select name="param[]" size="<?php echo min($fields_cnt, 10); ?>" multiple="multiple" align="left">
+<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+<input type="hidden" name="back" value="tbl_select.php" />
+
+<fieldset id="fieldset_table_search">
+
+<fieldset id="fieldset_select_fields">
+    <legend><?php echo $strSelectFields; ?></legend>
+    <select name="param[]" size="<?php echo min($fields_cnt, 10); ?>"
+        multiple="multiple" align="left">
     <?php
-    echo "\n";
     // Displays the list of the fields
-    for ($i = 0 ; $i < $fields_cnt; $i++) {
-        echo '                            '
-            . '<option value="' . htmlspecialchars($fields_list[$i]) . '" selected="selected">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
+    foreach ( $fields_list as $each_field ) {
+        echo '        '
+            .'<option value="' . htmlspecialchars( $each_field ) . '"'
+            .' selected="selected">' . htmlspecialchars( $each_field )
+            .'</option>' . "\n";
     }
     ?>
-                            </select>
-                        </td>
-                        <td valign="bottom" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-                            <input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" /><label for="oDistinct">DISTINCT</label>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-            <td nowrap="nowrap" width="50">&nbsp;</td>
-            <td valign="top">
-                <table border="0" cellpadding="3" cellspacing="0">
-                    <tr>
-                        <th align="left">
-                            <?php echo $strLimitNumRows . "\n"; ?>:
-                        </th>
-                    </tr>
-                    <tr>
-                        <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-                            <input type="text" size="4" name="session_max_rows" value="<?php echo $cfg['MaxRows']; ?>" class="textfield" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>&nbsp;</td>
-                    </tr>
-                    <tr>
-                        <th align="left">
-                            <?php echo $strDisplayOrder; ?>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-                            <select name="orderField" style="vertical-align: middle">
-                                <option value="--nil--"></option>
-            <?php
-    echo "\n";
-    for ($i = 0; $i < $fields_cnt; $i++) {
-        echo '                                ';
-        echo '<option value="' . htmlspecialchars($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
+    </select>
+    <input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" />
+    <label for="oDistinct">DISTINCT</label>
+</fieldset>
+
+<fieldset id="fieldset_limit_rows">
+    <legend><?php echo $strLimitNumRows; ?></legend>
+    <input type="text" size="4" name="session_max_rows"
+        value="<?php echo $GLOBALS['cfg']['MaxRows']; ?>" class="textfield" />
+</fieldset>
+
+<fieldset id="fieldset_display_order">
+    <legend><?php echo $strDisplayOrder; ?></legend>
+    <select name="orderField" style="vertical-align: middle">
+        <option value="--nil--"></option>
+    <?php
+    foreach ( $fields_list as $each_field ) {
+        echo '        '
+            .'<option value="' . htmlspecialchars( $each_field ) . '">'
+            .htmlspecialchars( $each_field ) . '</option>' . "\n";
     } // end for
     ?>
-                            </select><br />
-                            <input type="radio" name="order" value="ASC" checked="checked" id="sortASC" /><label for="sortASC"><?php echo $strAscending; ?></label><br />
-                            <input type="radio" name="order" value="DESC" id="sortDESC" /><label for="sortDESC"><?php echo $strDescending; ?></label>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
-    <table border="0" cellpadding="3" cellspacing="0">
-        <tr>
-            <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-            <th align="left" class="tblHeaders" colspan="2">
-                <?php echo $strAddSearchConditions; ?>
-                <?php echo PMA_showMySQLDocu('SQL-Syntax', 'Functions') . "\n"; ?>
-            </th>
-        </tr>
-        <tr>
-            <td>
-                <input type="text" name="where" class="textfield" size="64" />
-            </td>
-            <td align="right">
-                <input type="submit" name="submit" value="<?php echo $strGo; ?>" />
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2">&nbsp;</td>
-        </tr>
-        <tr>
-            <th align="left" class="tblHeaders" colspan="2">
-                <?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?>
-            </th>
-        </tr>
-        <tr>
-            <td colspan="2">
-            <table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
-            <tr>
-                <th><?php echo $strField; ?></th>
-                <th><?php echo $strType; ?></th>
-                <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '<th>' . $strCollation . '</th>' . "\n" : ''; ?>
-                <th><?php echo $strOperator; ?></th>
-                <th><?php echo $strValue; ?></th>
-            </tr>
+    </select>
+
+    <div class="formelement">
+        <input type="radio" name="order" value="ASC" checked="checked" id="sortASC" />
+        <label for="sortASC"><?php echo $strAscending; ?></label>
+    </div>
+
+    <div class="formelement">
+        <input type="radio" name="order" value="DESC" id="sortDESC" />
+        <label for="sortDESC"><?php echo $strDescending; ?></label>
+    </div>
+</fieldset>
+
+<br class="clearfloat" />
+<?php echo $strAddSearchConditions; ?>
+<?php echo PMA_showMySQLDocu('SQL-Syntax', 'Functions'); ?>
+
+<input type="text" name="where" class="textfield" size="64" />
+
+</fieldset>
+<fieldset class="tblFooters">
+    <input type="submit" name="submit" value="<?php echo $strGo; ?>" />
+</fieldset>
+
+<fieldset id="fieldset_table_qbe">
+    <legend><?php echo '<em>' . $strOr . '</em> ' . $strDoAQuery; ?></legend>
+    <table class="data">
+    <thead>
+    <tr><th><?php echo $strField; ?></th>
+        <th><?php echo $strType; ?></th>
+        <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '<th>' . $strCollation . '</th>' . "\n" : ''; ?>
+        <th><?php echo $strOperator; ?></th>
+        <th><?php echo $strValue; ?></th>
+    </tr>
+    </thead>
+    <tbody>
     <?php
+    $odd_row = true;
     for ($i = 0; $i < $fields_cnt; $i++) {
-        echo "\n";
-        $bgcolor   = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
         ?>
-            <tr>
-                <td bgcolor="<?php echo $bgcolor; ?>"><b><?php echo htmlspecialchars($fields_list[$i]); ?></b></td>
-                <td bgcolor="<?php echo $bgcolor; ?>"><?php echo $fields_type[$i]; ?></td>
-                <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '<td bgcolor="' . $bgcolor . '">' . $fields_collation[$i] . '</td>' . "\n" : ''; ?>
-                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <select name="func[]">
+        <tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
+            <th><?php echo htmlspecialchars($fields_list[$i]); ?></th>
+            <td><?php echo $fields_type[$i]; ?></td>
+            <?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '<td>'
+                . $fields_collation[$i] . '</td>' . "\n" : ''; ?>
+            <td><select name="func[]">
         <?php
         if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
-            foreach ($GLOBALS['cfg']['EnumOperators'] as $k => $fc) {
+            foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
                 echo "\n" . '                        '
-                   . '<option value="' . htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
+                   . '<option value="' . htmlspecialchars($fc) . '">'
+                   . htmlspecialchars($fc) . '</option>';
             }
         } elseif (preg_match('@char|blob|text|set@i', $fields_type[$i])) {
-            foreach ($GLOBALS['cfg']['TextOperators'] as $k => $fc) {
+            foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
             echo "\n" . '                        '
-               . '<option value="' . htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
+               . '<option value="' . htmlspecialchars($fc) . '">'
+               . htmlspecialchars($fc) . '</option>';
             }
         } else {
-            foreach ($GLOBALS['cfg']['NumOperators'] as $k => $fc) {
+            foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
                 echo "\n" . '                        '
-                   . '<option value="' .  htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
+                   . '<option value="' .  htmlspecialchars($fc) . '">'
+                   . htmlspecialchars($fc) . '</option>';
             }
         } // end if... else...
         if ($fields_null[$i]) {
-            foreach ($GLOBALS['cfg']['NullOperators'] as $k => $fc) {
+            foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
                 echo "\n" . '                        '
-                   . '<option value="' .  htmlspecialchars($fc) . '">' . htmlspecialchars($fc) . '</option>';
+                   . '<option value="' .  htmlspecialchars($fc) . '">'
+                   . htmlspecialchars($fc) . '</option>';
             }
         }
-        echo "\n";
         ?>
-                    </select>
-                </td>
-                <td bgcolor="<?php echo $bgcolor; ?>">
+
+                </select>
+            </td>
+            <td>
         <?php
         // <markus@noga.de>
         $field = $fields_list[$i];
@@ -273,61 +239,66 @@ function PMA_tbl_select_operator(f, index, multiple) {
         // do not use require_once here
         require('./libraries/get_foreign.lib.php');
 
-        echo "\n";
         // we got a bug report: in some cases, even if $disp is true,
         // there are no rows, so we add a fetch_array
 
         if ($foreigners && isset($foreigners[$field]) && isset($disp_row) && is_array($disp_row)) {
             // f o r e i g n    k e y s
-            echo '                    <select name="fields[' . $i . ']">' . "\n";
+            echo '            <select name="fields[' . $i . ']">' . "\n";
             // go back to first row
 
             // here, the 4th parameter is empty because there is no current
             // value of data for the dropdown (the search page initial values
             // are displayed empty)
-            echo PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, '', $cfg['ForeignKeyMaxLimit']);
-            echo '                    </select>' . "\n";
-        } else if (isset($foreign_link) && $foreign_link == true) {
-        ?>
-            <input type="text"   name="fields[<?php echo $i; ?>]" id="field_<?php echo md5($field); ?>[<?php echo $i; ?>]" class="textfield" />
+            echo PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display,
+                '', $GLOBALS['cfg']['ForeignKeyMaxLimit']);
+            echo '            </select>' . "\n";
+        } elseif (isset($foreign_link) && $foreign_link == true) {
+            ?>
+            <input type="text" name="fields[<?php echo $i; ?>]"
+                id="field_<?php echo md5($field); ?>[<?php echo $i; ?>]"
+                class="textfield" />
             <script type="text/javascript" language="javascript">
                 document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>&amp;fieldkey=<?php echo $i; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
             </script>
-        <?php
-        } else if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
+            <?php
+        } elseif (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
             // e n u m s
             $enum_value=explode(', ', str_replace("'", '', substr($fields_type[$i], 5, -1)));
             $cnt_enum_value = count($enum_value);
-            echo '                    <select name="fields[' . $i . '][]" multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n";
+            echo '            <select name="fields[' . $i . '][]"'
+                .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n";
             for ($j = 0; $j < $cnt_enum_value; $j++) {
-                echo '                        <option value="' . $enum_value[$j] . '">' . $enum_value[$j] . '</option>';
+                echo '                <option value="' . $enum_value[$j] . '">'
+                    . $enum_value[$j] . '</option>';
             } // end for
-            echo '                    </select>' . "\n";
+            echo '            </select>' . "\n";
         } else {
             // o t h e r   c a s e s
-            echo '                    <input type="text" name="fields[' . $i . ']" size="40" class="textfield" />' .  "\n";
+            echo '            <input type="text" name="fields[' . $i . ']"'
+                .' size="40" class="textfield" />' .  "\n";
         }
 
         ?>
-                    <input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" />
-                    <input type="hidden" name="types[<?php echo $i; ?>]" value="<?php echo $fields_type[$i]; ?>" />
-                    <input type="hidden" name="collations[<?php echo $i; ?>]" value="<?php echo $fields_collation[$i]; ?>" />
-                </td>
-            </tr>
+            <input type="hidden" name="names[<?php echo $i; ?>]"
+                value="<?php echo htmlspecialchars($fields_list[$i]); ?>" />
+            <input type="hidden" name="types[<?php echo $i; ?>]"
+                value="<?php echo $fields_type[$i]; ?>" />
+            <input type="hidden" name="collations[<?php echo $i; ?>]"
+                value="<?php echo $fields_collation[$i]; ?>" />
+        </td>
+    </tr>
         <?php
     } // end for
-    echo "\n";
     ?>
-            </table>
-            </td>
-        </tr>
-        <tr>
-            <td nowrap="nowrap" colspan="2" align="right">
-                <input type="hidden" name="max_number_of_fields" value="<?php echo $fields_cnt; ?>" />
-                <input type="submit" name="submit" value="<?php echo $strGo; ?>" />
-            </td>
-        </tr>
+    </tbody>
     </table>
+</fieldset>
+<fieldset class="tblFooters">
+    <input type="hidden" name="max_number_of_fields"
+        value="<?php echo $fields_cnt; ?>" />
+    <input type="submit" name="submit" value="<?php echo $strGo; ?>" />
+</fieldset>
 </form>
     <?php
     require_once('./footer.inc.php');
@@ -349,12 +320,9 @@ else {
     if (count($param) == $max_number_of_fields) {
         $sql_query .= '* ';
     } else {
-
-        $sql_query .= PMA_backquote(urldecode($param[0]));
-        $c         = count($param);
-        for ($i = 1; $i < $c; $i++) {
-            $sql_query .= ',' . PMA_backquote(urldecode($param[$i]));
-        }
+        $param = PMA_backquote( $param );
+        $sql_query .= implode( ', ', $param );
+        unset( $param );
     } // end if
 
     $sql_query .= ' FROM ' . PMA_backquote($table);