diff --git a/ChangeLog b/ChangeLog
index 3a525df1f..251da7176 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,18 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-10-11 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * footer.inc.php, index.php, left.php, queryframe.php, querywindow.php
+      server_databases.php, css/phpmyadmin.css.php, libraries/common.lib.php
+      libraries/left_header.inc.php, libraries/sql_query_form.lib.php
+      themes/darkblue_orange/css/theme_left.css.php
+      themes/original/css/theme_left.css.php:
+      XHTML 1.0 trans. compliance and more semantic XHTML output
+
+CVS-Vorgang erfolgreich abgeschlossen
+
+
+
 2005-10-09 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_links.php: invalid js confirmation and operation feedback
       when dropping a view
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 22dba82ed..04f76e93d 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -43,7 +43,7 @@ table .name {
 }
 
 div#tablestatistics {
-    border-bottom: 0.1em solid silver;
+    border-bottom: 0.1em solid #669999;
     margin-bottom: 0.5em;
     padding-bottom: 0.5em;
 }
@@ -62,20 +62,21 @@ div#pmalogo,
 div#leftframelinks,
 div#databaseList {
     text-align: center;
-    border-bottom: 0.1em solid silver;
+    border-bottom: 0.1em solid #669999;
     margin-bottom: 0.5em;
     padding-bottom: 0.5em;
 }
 
+div#leftframelinks img {
+    vertical-align: middle;
+}
+
 div#leftframelinks a {
-    margin: 0.1em;
-    padding: 0.2em;
-    border: 0.1em solid <?php echo $cfg['BgcolorTwo']; ?>;
+    padding: 0.1em;
 }
 
 div#leftframelinks a:hover {
-    border-color: gray;
-    background-color: silver;
+    background-color: #669999;
 }
 
 div#databaseList form {
@@ -98,6 +99,46 @@ div#querywindowcontainer fieldset {
 }
 
 
+body#body_leftFrame {
+    background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+}
+
+/* leftdatabaselist */
+div#left_tableList ul {
+    list-style-type: none;
+    list-style-position: outside;
+    margin: 0;
+    padding: 0;
+    background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+}
+
+div#left_tableList li {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+
+<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
+div#left_tableList li:hover {
+    background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+}
+<?php } ?>
+
+div#left_tableList img {
+    height: 1em;
+    width: auto;
+    padding: 0;
+    vertical-align: middle;
+}
+
+div#left_tableList ul ul {
+    margin-left: 0em;
+    padding-left: 0.1em;
+    border-left: 0.1em solid #669999;
+    padding-bottom: 0.1em;
+    border-bottom: 0.1em solid #669999;
+}
+
 /* querybox */
 
 /* Gecko bug */
@@ -186,7 +227,7 @@ form.clock   { text-align: center; }
 
 /* Options, eg. on import page */
 fieldset {
-    background-color: <?php echo $cfg['BgcolorOne']; ?>;
+    background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
 }
 fieldset legend {
     background-color: transparent;
@@ -258,7 +299,7 @@ a.tabactive {
 /* default tab styles */
 .tab, .tabcaution, .tabactive {
     background-color: #E5E5E5;
-    border: 0.1em solid silver;
+    border: 0.1em solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
     border-bottom: 0.1em solid black;
     border-radius-topleft: 0.5em;
     border-radius-topright: 0.5em;
@@ -288,13 +329,13 @@ span.tab, span.tabcaution {
 /* odd table rows 1,3,5,7,... */
 table tbody tr.odd td,
 table tbody tr.odd th {
-    background-color: <?php echo $cfg['BgcolorOne']; ?>;
+    background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
 }
 
 /* even table rows 2,4,6,8,... */
 table tbody tr.even td,
 table tbody tr.even th {
-    background-color: <?php echo $cfg['BgcolorTwo']; ?>;
+    background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
 }
 
 
diff --git a/footer.inc.php b/footer.inc.php
index d2de583d1..6fa1d462f 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -15,64 +15,29 @@ require_once('./libraries/relation.lib.php'); // for PMA_setHistory()
 
 // If query window is wanted and open, update with latest selected db/table.
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
-?>
 
+    // $is_drop_database comes from sql.php when we saw a DROP DATABASE
+    // $force_queryframe_reload comes from db_operations.php
+    if ( empty( $is_drop_database ) &&  empty( $force_queryframe_reload ) ) {
+        $force_queryframe_reload = 'false';
+    } else {
+        $force_queryframe_reload = 'true';
+    }
+?>
 <script type="text/javascript">
 <!--
 <?php
     if (!isset($no_history) && !empty($db) && (!isset($error_message) || $error_message == '')) {
-        $tables              = PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE);
-        $num_tables          = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
-        $common_url_query    = PMA_generate_common_url($db);
-        // if we put a space before the left bracket, it causes a display
-        // problem in IE
-        if ($num_tables) {
-            $num_tables_disp = '(' . $num_tables . ')';
-        } else {
-            $num_tables_disp = '(-)';
-        }
-    ?>
-    var forceQueryFrameReload = false;
-<?php
-    // $is_drop_database comes from sql.php when we saw a DROP DATABASE
-    // $force_queryframe_reload comes from db_operations.php
-    if ((isset($is_drop_database) && $is_drop_database) || (isset($force_queryframe_reload) && $force_queryframe_reload == TRUE)) {
-?>
-    forceQueryFrameReload = true;
-<?php
-    }
-?>
-    var dbBoxSetupDone = false;
-    function dbBoxSetup() {
-        if (dbBoxSetupDone != true) {
-            if (parent.frames.queryframe && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
-                parent.frames.queryframe.document.left.lightm_db.value = '<?php echo addslashes($db); ?>';
-                dbBoxSetupDone = true;
-            } else {
-                setTimeout("dbBoxSetup();",500);
-            }
-        }
-    }
-    if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
-        parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
-        parent.frames.queryframe.document.queryframeform.table.value = "<?php echo (isset($table) ? addslashes($table) : ''); ?>";
-    }
-    if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.left && parent.frames.queryframe.document.left.lightm_db) {
-        selidx = parent.frames.queryframe.document.left.lightm_db.selectedIndex;
-        if (parent.frames.queryframe.document.left.lightm_db.options[selidx].value == "<?php echo addslashes($db); ?>" && forceQueryFrameReload == false) {
-            parent.frames.queryframe.document.left.lightm_db.options[selidx].text =
-                parent.frames.queryframe.document.left.lightm_db.options[selidx].text.replace(/(.*)\([0-9]+\)/,'$1<?php echo $num_tables_disp;?>');
-        } else {
-            parent.frames.queryframe.location.reload();
-            setTimeout("dbBoxSetup();",2000);
-        }
-    }
-    <?php
+        $table = isset( $table ) ? $table : '';
+        ?>
+        // sets selection in left frame quick db selectbox to current db
+        parent.frames[0].setTable( '<?php echo $db; ?>', '<?php echo $table; ?>' );
+        <?php
     }
     ?>
 
     function reload_querywindow () {
-        if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
+        if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
             <?php
             if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
                 if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
@@ -82,45 +47,45 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
                         PMA_setHistory((isset($db) ? $db : ''), (isset($table) ? $table : ''), $cfg['Server']['user'], $sql_query);
                     }
                 }
-            ?>
-            if (!parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate || !parent.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) {
-                parent.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
-                parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
-                parent.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
-                parent.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
+                ?>
+            if (!parent.frames[0].querywindow.document.sqlform.LockFromUpdate || !parent.frames[0].querywindow.document.sqlform.LockFromUpdate.checked) {
+                parent.frames[0].querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
+                parent.frames[0].querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
+                parent.frames[0].querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
+                parent.frames[0].querywindow.document.querywindow.query_history_latest_table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
 
-                <?php echo (isset($sql_query) ? 'parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
+                <?php echo (isset($sql_query) ? 'parent.frames[0].querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
 
-                parent.frames.queryframe.querywindow.document.querywindow.submit();
+                parent.frames[0].querywindow.document.querywindow.submit();
             }
-            <?php
+                <?php
             } else {
-            ?>
+                ?>
             // no submit, query was invalid
-            <?php
+                <?php
             }
             ?>
         }
     }
 
     function focus_querywindow(sql_query) {
-        if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
-            if (parent.frames.queryframe.querywindow.document.querywindow.querydisplay_tab != 'sql') {
-                parent.frames.queryframe.querywindow.document.querywindow.querydisplay_tab.value = "sql";
-                parent.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = sql_query;
-                parent.frames.queryframe.querywindow.document.querywindow.submit();
-                parent.frames.queryframe.querywindow.focus();
+        if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
+            if (parent.frames[0].querywindow.document.querywindow.querydisplay_tab != 'sql') {
+                parent.frames[0].querywindow.document.querywindow.querydisplay_tab.value = "sql";
+                parent.frames[0].querywindow.document.querywindow.query_history_latest.value = sql_query;
+                parent.frames[0].querywindow.document.querywindow.submit();
+                parent.frames[0].querywindow.focus();
             } else {
-                parent.frames.queryframe.querywindow.focus();
+                parent.frames[0].querywindow.focus();
             }
 
             return false;
-        } else if (parent.frames.queryframe) {
+        } else if (parent.frames[0]) {
             new_win_url = 'querywindow.php?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
-            parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
+            parent.frames[0].querywindow=window.open(new_win_url, '','toolbar=0,location=0,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
 
-            if (!parent.frames.queryframe.querywindow.opener) {
-               parent.frames.queryframe.querywindow.opener = parent.frames.queryframe;
+            if (!parent.frames[0].querywindow.opener) {
+               parent.frames[0].querywindow.opener = parent.frames[0];
             }
 
             // reload_querywindow();
@@ -129,19 +94,19 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
     }
 
     reload_querywindow();
-<?php
-if (isset($focus_querywindow) && $focus_querywindow == "true") {
-?>
-    if (parent.frames.queryframe && parent.frames.queryframe.querywindow && !parent.frames.queryframe.querywindow.closed && parent.frames.queryframe.querywindow.location) {
-        self.focus();
+    <?php
+    if (isset($focus_querywindow) && $focus_querywindow == "true") {
+        ?>
+        if (parent.frames[0] && parent.frames[0].querywindow && !parent.frames[0].querywindow.closed && parent.frames[0].querywindow.location) {
+            self.focus();
+        }
+        <?php
     }
-<?php
-}
-?>
+    ?>
 
 //-->
 </script>
-<?php
+    <?php
 }
 
 
@@ -154,26 +119,23 @@ if (isset($GLOBALS['dbh']) && $GLOBALS['dbh']) {
 if (isset($GLOBALS['userlink']) && $GLOBALS['userlink']) {
     @PMA_DBI_close($GLOBALS['userlink']);
 }
-?>
 
-<?php include('./config.footer.inc.php'); ?>
+include('./config.footer.inc.php');
+?>
     <script type="text/javascript" language="javascript" src="libraries/tooltip.js"></script>
 </body>
-
 </html>
 <?php
 
 /**
  * Generates profiling data if requested
  */
-if (isset($GLOBALS['cfg']['DBG']['enable'])
-        && $GLOBALS['cfg']['DBG']['enable']
-        && isset($GLOBALS['cfg']['DBG']['profile']['enable'])
-        && $GLOBALS['cfg']['DBG']['profile']['enable']) {
+if ( ! empty( $GLOBALS['cfg']['DBG']['enable'] )
+  && ! empty( $GLOBALS['cfg']['DBG']['profile']['enable'] ) ) {
     //run the basic setup code first
     require_once('./libraries/dbg/setup.php');
     //if the setup ran fine, then do the profiling
-    if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']) {
+    if ( ! empty( $GLOBALS['DBG'] ) ) {
         require_once('./libraries/dbg/profiling.php');
         dbg_dump_profiling_results();
     }
@@ -182,8 +144,8 @@ if (isset($GLOBALS['cfg']['DBG']['enable'])
 /**
  * Sends bufferized data
  */
-if (isset($GLOBALS['cfg']['OBGzip']) && $GLOBALS['cfg']['OBGzip']
-        && isset($GLOBALS['ob_mode']) && $GLOBALS['ob_mode']) {
+if ( ! empty( $GLOBALS['cfg']['OBGzip'] )
+  && ! empty( $GLOBALS['ob_mode'] ) ) {
     PMA_outBufferPost($GLOBALS['ob_mode']);
 }
 
@@ -191,5 +153,4 @@ if (isset($GLOBALS['cfg']['OBGzip']) && $GLOBALS['cfg']['OBGzip']
  * Stops the script execution
  */
 exit;
-
-?>
+?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 95c5128b3..9907b1ff9 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,39 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
+/**
+ * forms frameset
+ * 
+ * @uses    libraries/grab_globals.lib.php  import variables
+ * @uses    libraries/common.lib.php        global fnctions
+ * @uses    libraries/select_theme.lib.php  theme manager
+ * @uses    libraries/relation.lib.php      table relations
+ * @uses    $GLOBALS['strNoFrames']
+ * @uses    $GLOBALS['cfg']['QueryHistoryDB']
+ * @uses    $GLOBALS['cfg']['Server']['user']
+ * @uses    $GLOBALS['cfg']['DefaultTabServer']     as src for the mainframe
+ * @uses    $GLOBALS['cfg']['DefaultTabDatabase']   as src for the mainframe
+ * @uses    $GLOBALS['cfg']['LeftWidth']            for left frame width
+ * @uses    $GLOBALS['collation_connection']    from $_REQUEST (grab_globals.lib.php)
+ *                                              or common.lib.php
+ * @uses    $GLOBALS['available_languages'] from common.lib.php (select_lang.lib.php)
+ * @uses    $GLOBALS['cookie_path']         from common.lib.php
+ * @uses    $GLOBALS['is_https']            from common.lib.php
+ * @uses    $GLOBALS['db']
+ * @uses    $GLOBALS['charset']
+ * @uses    $GLOBALS['lang']
+ * @uses    $GLOBALS['text_dir']
+ * @uses    $_ENV['HTTP_HOST']
+ * @uses    PMA_getRelationsParam()
+ * @uses    PMA_purgeHistory()
+ * @uses    PMA_generate_common_url()
+ * @uses    PMA_VERSION
+ * @uses    setcookie()
+ * @uses    session_write_close()
+ * @uses    time()
+ * @uses    getenv()
+ * @uses    header()                to send charset
+ */
 
 /**
  * Gets core libraries and defines some variables
@@ -11,22 +44,24 @@ require_once('./libraries/common.lib.php');
  * Includes the ThemeManager if it hasn't been included yet
  */
 require_once('./libraries/select_theme.lib.php');
+require_once('./libraries/relation.lib.php');
+
+// hash for the window names, against window hijacking
+$_SESSION['window_name_hash'] = time();
+
+// free the session file, for the other frames to be loaded
+session_write_close();
 
 /**
  * Saves collation_connection (coming from main.php) in a cookie
  */
-
 // (from grab_globals)
-if (isset($collation_connection)) {
-    if (!isset($pma_uri_parts)) {
-        $pma_uri_parts = parse_url($cfg['PmaAbsoluteUri']);
-        $cookie_path   = substr($pma_uri_parts['path'], 0, strrpos($pma_uri_parts['path'], '/'));
-        $is_https      = (isset($pma_uri_parts['scheme']) && $pma_uri_parts['scheme'] == 'https') ? 1 : 0;
-    }
-    setcookie('pma_collation_connection', $collation_connection, time() + 60*60*24*30, $cookie_path, '', $is_https);
+// TODO: move into common.lib.php line #360
+if ( isset( $collation_connection ) ) {
+    setcookie( 'pma_collation_connection', $collation_connection,
+        time() + 60*60*24*30, $cookie_path, '', $is_https );
 }
-// Gets the default font sizes
-PMA_setFontSizes();
+
 
 // Gets the host name
 // loic1 - 2001/25/11: use the new globals arrays defined with php 4.1+
@@ -41,121 +76,74 @@ if (empty($HTTP_HOST)) {
         $HTTP_HOST = '';
     }
 }
-/**
- * Defines the frameset
- */
-// loic1: If left light mode -> urldecode the db name
-if (isset($lightm_db)) {
-// no longer urlencoded because of html entities in the db name
-//    $db    = urldecode($lightm_db);
-    $db    = $lightm_db;
-    unset($lightm_db);
-}
-$url_query = PMA_generate_common_url(isset($db) ? $db : '');
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 
-require_once('./libraries/relation.lib.php');
+
+// purge querywindow history
 $cfgRelation = PMA_getRelationsParam();
-
-if ($cfg['QueryHistoryDB'] && $cfgRelation['historywork']) {
-    PMA_purgeHistory($cfg['Server']['user']);
+if ( $GLOBALS['cfg']['QueryHistoryDB'] && $cfgRelation['historywork'] ) {
+    PMA_purgeHistory( $GLOBALS['cfg']['Server']['user'] );
 }
 
-$phpmain_hash = md5($cfg['PmaAbsoluteUri']);
-$phpmain_hash_js = time();
+$drops = array( 'lang', 'server', 'convcharset', 'collation_connection',
+    'db', 'table' );
+
+$url_querys = array();
+// pass variables to child pages
+foreach( $_GET as $key => $val ) {
+    if ( ! in_array( $key, $drops ) ) {
+        $url_querys[] = urlencode( $key ) . '=' . urlencode( $val );
+    }
+}
+unset( $drops );
+
+if ( count( $url_querys ) ) {
+    $url_query = implode( '&amp;', $url_querys ) . '&amp;';
+} else {
+    $url_query = '';
+}
+unset( $url_querys );
+
+if ( empty( $GLOBALS['db'] ) ) {
+    $url_query .= PMA_generate_common_url();
+    $main_target = $GLOBALS['cfg']['DefaultTabServer'];
+} elseif ( empty( $GLOBALS['table'] ) ) {
+    $url_query .= PMA_generate_common_url( $GLOBALS['db'] );
+    $main_target = $GLOBALS['cfg']['DefaultTabDatabase'];
+} else {
+    $url_query .= PMA_generate_common_url( $GLOBALS['db'], $GLOBALS['table'] );
+    $main_target = $GLOBALS['cfg']['DefaultTabTable'];
+}
+
+$main_target .= '?' . $url_query;
+
+$lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
+
+
+// start output
+header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xml:lang="<?php echo $lang_iso_code; ?>"
+    lang="<?php echo $lang_iso_code; ?>"
+    dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=right" />
+<meta http-equiv="Content-Type"
+    content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
 </head>
-
-<?php
-$logo_image = $GLOBALS['pmaThemeImage'] . 'logo_left.png';
-$query_frame_height = 0;
-if ($cfg['LeftDisplayLogo'] && @file_exists($logo_image)) {
-    $tmp_imgsize = @getimagesize($logo_image);
-    $query_frame_height = ($tmp_imgsize[1] + 60);
-    // increase the height to take into account font size differences in
-    // theme 'original'? (TODO: improve with a parameter in layout.inc.php)
-    $query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 25 : 0);
-}
-if ($query_frame_height == 0) {
-    $query_frame_height = 60;
-}
-// increase the height to take into account font size differences in
-// theme 'original'? (TODO: improve with a parameter in layout.inc.php)
-$query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 20 : 10);
-
-if ($cfg['LeftDisplayServers'] && !$cfg['DisplayServersList']) {
-    $query_frame_height += 40;
-}
-if ($server > 0) {
-    PMA_availableDatabases(); // this function is defined in "common.lib.php"
-} else {
-    $num_dbs = 0;
-}
-if ($num_dbs > 1) {
-    if ($cfg['LeftFrameLight']) {
-        $query_frame_height += 20;
-    }
-}
-if ($cfg['QueryFrame']) {
-    /* Will we show list of servers? */
-    if ($cfg['LeftDisplayServers'] && $cfg['DisplayServersList'] && count($cfg['Servers']) > 1) {
-        $query_frame_height += (count($cfg['Servers']) + 1)*15;
-    }
-
-    if ($cfg['QueryFrameJS']) {
-        echo '<script type="text/javascript">' . "\n";
-        echo '<!--' . "\n";
-        echo '    document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="1" name="mainFrameset" id="mainFrameset">\');' . "\n";
-        echo '    document.writeln(\'    <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">\');' . "\n";
-        echo '    document.writeln(\'        <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />\');' . "\n";
-        echo '    document.writeln(\'        <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" id="leftFrame" />\');' . "\n";
-        echo '    document.writeln(\'    </frameset>\');' . "\n";
-        echo '    document.writeln(\'    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" style="border-left: 1px solid #000000;" id="rightFrame" />\');' . "\n";
-        echo '    document.writeln(\'    <noframes>\');' . "\n";
-        echo '    document.writeln(\'        <body bgcolor="#FFFFFF">\');' . "\n";
-        echo '    document.writeln(\'            <p>' . str_replace("'", "\'", $strNoFrames) . '</p>\');' . "\n";
-        echo '    document.writeln(\'        </body>\');' . "\n";
-        echo '    document.writeln(\'    </noframes>\');' . "\n";
-        echo '    document.writeln(\'</frameset>\');' . "\n";
-        echo '//-->' . "\n";
-        echo '</script>' . "\n";
-        echo "\n";
-        echo '<noscript>' . "\n";
-    }
-
-    echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*"  border="1" frameborder="1" framespacing="1" name="mainFrameset" id="mainFrameset">' . "\n";
-    echo '    <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">' . "\n";
-    echo '        <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />' . "\n";
-    echo '        <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n";
-    echo '    </frameset>' . "\n";
-    echo '    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" id="rightFrame" />' . "\n";
-
-} else {
-
-    echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="1" id="leftFrameset" >' . "\n";
-    echo '    <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n";
-    echo '    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" id="rightFrame" frameborder="1" />' . "\n";
-
-}
-?>
-
+<frameset cols="<?php echo $GLOBALS['cfg']['LeftWidth']; ?>,*" rows="*" id="mainFrameset">
+    <frame frameborder="0" id="leftFrame"
+        src="left.php?<?php echo $url_query; ?>" 
+        name="nav<?php echo $_SESSION['window_name_hash']; ?>" />
+    <frame frameborder="0" id="rightFrame"
+        src="<?php echo $main_target; ?>" 
+        name="phpmain<?php echo $_SESSION['window_name_hash']; ?>" />
     <noframes>
-        <body bgcolor="#FFFFFF">
-            <p><?php echo $strNoFrames; ?></p>
+        <body>
+            <p><?php echo $GLOBALS['strNoFrames']; ?></p>
         </body>
     </noframes>
 </frameset>
-<?php
-if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
-    echo '</noscript>' . "\n";
-}
-?>
-
-</html>
+</html>
\ No newline at end of file
diff --git a/left.php b/left.php
index d60039cf2..143f249af 100644
--- a/left.php
+++ b/left.php
@@ -1,196 +1,53 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-
+/**
+ * display db and table selection
+ */
 
 /**
  * Gets the variables sent to this script, retains the db name that may have
  * been defined as startup option and include a core library
  */
 require_once('./libraries/grab_globals.lib.php');
-if (isset($lightm_db) && !empty($lightm_db)) {
-// no longer urlencoded because of html entities in the db name
-//    $db = urldecode($lightm_db);
-    $db = $lightm_db;
-}
+
+// free the session file, for the other frames to be loaded
+session_write_close();
 
 if (!empty($db)) {
     $db_start = $db;
+} else {
+    $db_start = '';
 }
 
+$db     = isset( $db )    ? $db    : '';
+$table  = isset( $table ) ? $table : '';
 
 /**
  * Gets a core script and starts output buffering work
  */
 require_once('./libraries/common.lib.php');
 require_once('./libraries/ob.lib.php');
-if ($cfg['OBGzip']) {
+if ($GLOBALS['cfg']['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
         PMA_outBufferPre($ob_mode);
     }
 }
 
-// This check had been put here to avoid revealing the full path
-// of the phpMyAdmin directory in case this script is called
-// directly. But some users report a "Missing hash" message and
-// I cannot reproduce it, so let's define $hash to a dummy value
-// and hope some other clue will surface, to sort this bug.
-//PMA_checkParameters(array('hash'));
-if (!isset($hash)) {
-    $hash='';
-}
-
 require_once('./libraries/bookmark.lib.php');
 require_once('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
-function PMA_multimerge(&$stack, &$table) {
-global $list_item, $table_item;
-
-    $key = array_shift($table);
-
-    if (count($table) > 0) {
-        if (!isset($stack[$key])) {
-            $stack[$key] = '';
-        }
-        PMA_multimerge($stack[$key], $table);
-    } else {
-        $stack['pma_name'][]      = $table_item;
-        $stack['pma_list_item'][] = $list_item;
-    }
-}
-
-/* This will take a 1-dimensional array, and shift as many elemnts off
- * the end, until the allowed maximum level is reached */
-function PMA_reduceNest(&$_table) {
-    if ($GLOBALS['cfg']['LeftFrameTableLevel'] > 0) {
-        $elements = count($_table);
-        for ($ti = $elements; $ti > $GLOBALS['cfg']['LeftFrameTableLevel']; $ti--) {
-            unset($_table[$ti]);
-        }
-    }
-}
-
-function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_level, $val, $childout = true) {
-    $name = $key;
-    //$id = preg_replace('@[^a-z0-9]*@i', '', $baseid . $keyhistory . $key) . $indent;
-    $id = base64_encode($baseid . $keyhistory . $key) . $indent;
-
-    $groupkey = $keyhistory . ($key != $keyhistory ? $GLOBALS['cfg']['LeftFrameTableSeparator'] . $key : '');
-
-    $on_mouse = (($GLOBALS['cfg']['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"');
-
-    $countarray = $val;
-    if (count($countarray) == 2 && isset($countarray['pma_name']) && isset($countarray['pma_list_item'])) {
-        $counter = count($countarray['pma_name']);
-    } else {
-        unset($countarray['pma_name']);
-        if (count($countarray) > 1) {
-            unset($countarray['pma_list_item']);
-        }
-        $counter = count($countarray);
-    }
-
-    echo "\n";
-    echo str_repeat(' ', $indent * 5) . '<div id="el' . $id . 'Parent" class="parent"' . $on_mouse . '>' . "\n";
-    echo str_repeat(' ', $indent * 6) . '<div class="nowrap"><img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' . '" border="0" width="' . (($indent - 1) * $indent_level) . '" height="9" alt="" /><a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', true); return false} else {return true}">';
-    echo '<img name="imEx" id="el' . $id . 'Img" src="' . $GLOBALS['pmaThemeImage'] . 'b_plus.png" border="0" width="9" height="9" alt="+" /></a>' . "\n";
-    echo str_repeat(' ', $indent * 6) . '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '&amp;tbl_group=' . htmlspecialchars($groupkey) . '" title="' . htmlspecialchars($name) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', false)}"><span class="heada">' . htmlspecialchars($name) . '<bdo dir="' . $GLOBALS['text_dir'] . '">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(' . $counter . ')</span></a></div>' . "\n";
-    echo str_repeat(' ', $indent * 5) . '</div><!-- class="PMA_nestedSetHeaderParent" -->' . "\n";
-    echo "\n";
-
-    if ($childout) {
-        echo str_repeat(' ', $indent * 5) . '<div id="el' . $id . 'Child" class="child nowrap" ' . $on_mouse . '>' . "\n";
-    }
-}
-
-function PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, $indent, $indent_level, $headerOut, $firstGroup = false, $firstGroupClose = true) {
-    if ($firstGroup) {
-        PMA_nestedSetHeaderParent($baseid, $firstGroup, $keyhistory, $indent, $indent_level, $tablestack);
-        $indent++;
-    }
-
-    foreach ($tablestack AS $key => $val) {
-        if ($key != 'pma_name' && $key != 'pma_list_item') {
-            if ($headerOut) {
-                PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_level, $val);
-            }
-
-            if (isset($val['pma_name']) && isset($val['pma_list_item']) && count($val) == 2) {
-                PMA_nestedSet($baseid, $val, $key, $keyhistory . ($keyhistory != '' ? $GLOBALS['cfg']['LeftFrameTableSeparator'] : '') . $key, false, ($indent + 1));
-            } else {
-                PMA_nestedSet($baseid, $val, $key, $keyhistory . ($keyhistory != '' ? $GLOBALS['cfg']['LeftFrameTableSeparator'] : '') . $key, true, ($indent + 1));
-            }
-
-            if ($headerOut) {
-                echo str_repeat(' ', $indent * 5) . '</div><!-- class="PMA_nestedSetHeader" -->' . "\n";
-            }
-        }
-    }
-
-    if ($firstGroup && $firstGroupClose) {
-        echo str_repeat(' ', $indent * 4) . '</div><!-- class="PMA_nestedSetHeader2" -->' . "\n";
-    } elseif ($firstGroup) {
-        echo str_repeat(' ', $indent * 4) . '<!-- spacer="div omitted" class="PMA_nestedSetHeader2" -->' . "\n";
-    }
-}
-
-function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory = '', $headerOut = false, $indent = 1) {
-
-    if ($keyhistory == '' && $key != '__protected__') {
-        $keyhistory = $key;
-    }
-
-    $indent_level = 9;
-
-    if (isset($tablestack)
-        && isset($tablestack['pma_name'])
-        && isset($tablestack['pma_list_item'])) {
-
-        if (count($tablestack) > 1 && !empty($key) && isset($tablestack['pma_name']) && isset($tablestack['pma_list_item']) && $indent == 1) {
-            PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, ($indent+1), $indent_level, $headerOut, $key, false);
-            $divClose = true;
-            $extra_indent = 1;
-        } else {
-            PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, $indent, $indent_level, $headerOut);
-            $divClose = false;
-            $extra_indent = 0;
-        }
-
-        $on_mouse = (($GLOBALS['cfg']['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"');
-
-        $loops = 0;
-        foreach ($tablestack['pma_name'] AS $tkey => $tval) {
-
-            echo str_repeat(' ', $indent * 5) . '<img src="' . $GLOBALS['pmaThemeImage'] . 'spacer.png' .'" border="0" width="' . (($indent+$extra_indent) * $indent_level) . '" height="9" alt="" />';
-            $items = explode("\n", $tablestack['pma_list_item'][$tkey]);
-            foreach ($items AS $ikey => $ival) {
-                echo "\n";
-                echo str_repeat(' ', ($indent * 5)) . $ival;
-            }
-            echo "\n";
-
-            $loops++;
-        }
-
-        if ($divClose) {
-            echo str_repeat(' ', $indent * 5) . '</div><!-- space="putting omitted div" class="PMA_nestedSet2" -->';
-        }
-
-    } elseif (is_array($tablestack)) {
-        PMA_nestedSetHeader($baseid, $tablestack, $keyhistory, (($key == '__protected__' && $indent == 1 )? ($indent-1) : ($indent + 1)), $indent_level, $headerOut,  (($key == '__protected__' && $indent == 1) || ($indent > 1) ? false : $key));
-    }
-
-    return true;
-}
 /**
  * Get the list and number of available databases.
  * Skipped if no server selected: in this case no database should be displayed
  * before the user choose among available ones at the welcome screen.
  */
 if ($server > 0) {
-    PMA_availableDatabases(); // this function is defined in "common.lib.php"
+    // this function is defined in "common.lib.php"
+    // it defines $num_dbs and $dblist
+    PMA_availableDatabases();
 } else {
     $num_dbs = 0;
 }
@@ -205,125 +62,195 @@ require_once('./libraries/header_http.inc.php');
 /**
  * Displays the frame
  */
-// Gets the font sizes to use
-PMA_setFontSizes();
-echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">"; // remove vertical scroll bar bug in ie
+// remove vertical scroll bar bug in ie
+echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][2]; ?>" lang="<?php echo $available_languages[$lang][2]; ?>" dir="<?php echo $text_dir; ?>">
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xml:lang="<?php echo $available_languages[$lang][2]; ?>"
+    lang="<?php echo $available_languages[$lang][2]; ?>"
+    dir="<?php echo $text_dir; ?>">
 
 <head>
     <title>phpMyAdmin</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-    <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> target="phpmain<?php echo $hash; ?>" />
+    <meta http-equiv="Content-Type"
+        content="text/html; charset=<?php echo $charset; ?>" />
+    <base href="<?php echo $GLOBALS['cfg']['PmaAbsoluteUri']; ?>"
+        target="phpmain<?php echo $_SESSION['window_name_hash']; ?>" />
 
     <script type="text/javascript" language="javascript">
     <!--
-    function goTo(targeturl, targetframe) {
-        if (!targetframe) {
-            targetframe = self;
+    var table = '<?php echo $GLOBALS['table']; ?>';
+    var db    = '<?php echo $GLOBALS['db']; ?>';
+    var querywindowurl = 'querywindow.php?<?php
+        echo PMA_generate_common_url('','','&'); ?>';
+    var querywindow = '';
+    
+    // sets current selected table (called from footer.inc.php)
+    function setTable( new_db, new_table ) {
+        if ( new_db != db ) {
+            if ( typeof( document.getElementById( new_db ) ) == 'undefined' ) {
+                goTo('left.php?<?php echo PMA_generate_common_url('','','&');?>&db=' + new_db + '&table=' + new_table);
+                return;
+            }
+            db = new_db;
+        }
+        
+        if ( new_table != table ) {
+            if ( typeof( document.getElementById( new_db + '.' + new_table ) ) == 'undefined' ) {
+                goTo('left.php?<?php echo PMA_generate_common_url('','','&');?>&db=' + new_db + '&table=' + new_table);
+                return;
+            }
+            table = new_table;
+        }
+    }
+    
+    // opens selected db in left and main frame
+    function openDb( db, nomain ) {
+        goTo('left.php?<?php echo PMA_generate_common_url('','','&');?>&db=' + db);
+        if ( !nomain ) {
+            goTo(
+                '<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] . '?' 
+                . PMA_generate_common_url('','','&');?>&db=' + db,
+                window.parent.frames[1] );
+        }
+        
+        return true;
+    }
+    
+    function open_querywindow( url ) {
+        if ( ! url ) {
+            url = querywindowurl + '&db=' + db + '&table=' + table;
+        }
+    
+        if (!querywindow.closed && querywindow.location) {
+            querywindow.focus();
+        } else {
+            querywindow=window.open( url, '',
+                'toolbar=0,location=0,directories=0,status=1,menubar=0,' +
+                'scrollbars=yes,resizable=yes,' +
+                'width=<?php echo $GLOBALS['cfg']['QueryWindowWidth']; ?>,' +
+                'height=<?php echo $GLOBALS['cfg']['QueryWindowHeight']; ?>');
+        }
+    
+        if (!querywindow.opener) {
+            querywindow.opener = blank;
+        }
+    
+        if (window.focus) {
+            querywindow.focus();
+        }
+    
+        return true;
+    }
+    
+    function toggle( id, only_open ) {
+        el = document.getElementById('subel' + id);
+        if ( ! el ) {
+            return false;
+        }
+        
+        img = document.getElementById('el' + id + 'Img');
+        
+        if ( el.style.display == 'none' || only_open ) {
+            el.style.display = '';
+            if ( img ) {
+                img.src = '<?php echo $pmaThemeImage; ?>b_minus.png';
+                img.alt = '-';
+            }
+        } else {
+            el.style.display = 'none';
+            if ( img ) {
+                img.src = '<?php echo $pmaThemeImage; ?>b_plus.png';
+                img.alt = '+';
+            }
+        }
+        return true;
+    }
+
+    function goTo( targeturl, target ) {
+        if ( target == 'main' ) {
+            target = window.parent.frames[1];
+        } else if ( target == 'query' ) {
+            //target = window.parent.frames[1];
+            return open_querywindow( targeturl );
+        } else if ( ! target ) {
+            target = window.parent.frames[0];
         }
 
-        if (targetframe) {
+        if ( target ) {
+            if ( target.location.href == targeturl ) {
+                return true;
+            } else if ( target.location.href == '<?php echo $GLOBALS['cfg']['PmaAbsoluteUri']; ?>' + targeturl ) {
+                return true;
+            }
 <?php if (PMA_USR_BROWSER_AGENT != 'SAFARI') { ?>
-            targetframe.location.replace(targeturl);
+            target.location.replace(targeturl);
 <?php } else { ?>
-            targetframe.location.href = targeturl;
+            target.location.href = targeturl;
 <?php } ?>
         }
 
         return true;
     }
-
-<?php
-if (isset($lightm_db) && !empty($lightm_db)) {
-?>
-    goTo('./<?php echo $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db, '', '&');?>', window.parent.frames['phpmain<?php echo $hash; ?>']);
-<?php
-} elseif (isset($lightm_db)) {
-?>
-    goTo('./main.php?<?php echo PMA_generate_common_url('', '', '&');?>', window.parent.frames['phpmain<?php echo $hash; ?>']);
-<?php
-}
-?>
     //-->
     </script>
-
-<?php
-// Expandable/collapsible databases list is only used if there is more than one
-// database to display
-if (($num_dbs > 1 || !empty($cfg['LeftFrameTableSeparator'])) && !$cfg['LeftFrameLight']) {
-    echo "\n";
-    ?>
-    <!-- Collapsible tables list scripts -->
-    <script type="text/javascript" language="javascript">
-    <!--
-    var imgUrlPlus  = "<?php echo $GLOBALS['pmaThemeImage'] . 'b_plus.png'; ?>";
-    var imgUrlMinus = "<?php echo $GLOBALS['pmaThemeImage'] . 'b_minus.png'; ?>";
-    var isDOM      = (typeof(document.getElementsByTagName) != 'undefined'
-                      && typeof(document.createElement) != 'undefined')
-                   ? 1 : 0;
-    var isIE4      = (typeof(document.all) != 'undefined'
-                      && parseInt(navigator.appVersion) >= 4)
-                   ? 1 : 0;
-    var isNS4      = (typeof(document.layers) != 'undefined')
-                   ? 1 : 0;
-    var capable    = (isDOM || isIE4 || isNS4)
-                   ? 1 : 0;
-    // Uggly fix for Opera and Konqueror 2.2 that are half DOM compliant
-    if (capable) {
-        if (typeof(window.opera) != 'undefined') {
-            var browserName = ' ' + navigator.userAgent.toLowerCase();
-            if ((browserName.indexOf('konqueror 7') == 0)) {
-                capable = 0;
-            }
-        }
-        else if (typeof(navigator.userAgent) != 'undefined') {
-            var browserName = ' ' + navigator.userAgent.toLowerCase();
-            if ((browserName.indexOf('konqueror') > 0) && (browserName.indexOf('konqueror/3') == 0)) {
-                capable = 0;
-            }
-        } // end if... else if...
-    } // end if
-
-    var isServer    = <?php echo ($server > 0) ? 'true' : 'false'; ?>;
-
-    document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />');
-    //-->
-    </script>
-<noscript>
-        <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
-</noscript>
-
-    <script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script>
-    <?php
-} // end if ($num_dbs > 1)
-
-else if ($num_dbs == 1) {
-    echo "\n";
-    ?>
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
-    <?php
-} // end if ($num_dbs == 1)
-
-else {
-    echo "\n";
-    ?>
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?js_frame=left&amp;num_dbs=0" />
-    <?php
-} // end if ($num_dbs < 1)
-
-echo "\n";
-?>
+    <link rel="stylesheet" type="text/css"
+        href="./css/phpmyadmin.css.php?js_frame=left" />
 </head>
 
-<body bgcolor="<?php echo $cfg['LeftBgColor']; ?>" id="body_leftFrame">
+<body id="body_leftFrame">
 <?php
-if ( ! $cfg['QueryFrame'] ) {
-    require 'libraries/left_header.inc.php';
-} // end !$cfg['QueryFrame']
+require 'libraries/left_header.inc.php';
 
+if ( $num_dbs === 0 ) {
+    // no database available, so we break here
+    echo '<p>' . $strNoDatabases . '</p></body></html>';
+    
+    /**
+     * Close MySql connections
+     */
+    if (isset($dbh) && $dbh) {
+        @PMA_DBI_close($dbh);
+    }
+    if (isset($userlink) && $userlink) {
+        @PMA_DBI_close($userlink);
+    }
+    
+    /**
+     * Sends bufferized data
+     */
+    if ( $GLOBALS['cfg']['OBGzip'] && isset( $ob_mode ) && $ob_mode ) {
+         PMA_outBufferPost( $ob_mode );
+    }
+    exit();
+} elseif ( $GLOBALS['cfg']['LeftFrameLight'] && $num_dbs > 1 ) {
+    // more than one database available and LeftFrameLight is true
+    // display db selectbox
+
+    $_location = PMA_generate_common_url( '', '' );
+    ?>
+    <div id="databaseList">
+    <form method="post" action="index.php" target="_parent" id="left"
+        onsubmit="
+        <?php /* open database in main window */ ?>
+        goTo( '<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] . '?' 
+                . $_location; ?>&amp;db=' + this.value, 'main' );
+        <?php /* refresh left frame with tables from selected db */ ?>
+        goTo( 'left.php?<?php echo $_location; ?>&amp;db=' + this.value);
+        return false;">
+    <label for="lightm_db"><?php echo $strDatabase; ?></label>
+    <?php
+    echo PMA_generate_common_hidden_inputs() . "\n";
+    echo PMA_getHtmlSelectDb( $db ) . "\n";
+    echo '<noscript>' . "\n"
+        .'<input type="submit" name="Go" value="' . $strGo . '" />' . "\n"
+        .'</noscript>' . "\n"
+        .'</form>' . "\n"
+        .'</div>' . "\n";
+    unset( $_location );
+}
 ?>
 <!-- Databases and tables list -->
 <div id="left_tableList">
@@ -331,502 +258,310 @@ if ( ! $cfg['QueryFrame'] ) {
 // Don't display expansible/collapsible database info if:
 // 1. $server == 0 (no server selected)
 //    This is the case when there are multiple servers and
-//    '$cfg['ServerDefault'] = 0' is set. In that case, we want the welcome
+//    '$GLOBALS['cfg']['ServerDefault'] = 0' is set. In that case, we want the welcome
 //    screen to appear with no database info displayed.
 // 2. there is only one database available (ie either only one database exists
-//    or $cfg['Servers']['only_db'] is defined and is not an array)
+//    or $GLOBALS['cfg']['Servers']['only_db'] is defined and is not an array)
 //    In this case, the database should not be collapsible/expandable
-if ($num_dbs > 1) {
 
-    // Light mode -> beginning of the select combo for databases
-    // Note: When javascript is active, the frameset will be changed from
-    // within left.php. With no JS (<noscript>) the whole frameset will
-    // be rebuilt with the new target frame.
-    if ($cfg['LeftFrameLight']) {
-        $table_list = '';
-        $table_list_header = '';
-        $db_name    = '';
-    } // end FrameLight
+// Light mode -> beginning of the select combo for databases
+// Note: When javascript is active, the frameset will be changed from
+// within left.php. With no JS (<noscript>) the whole frameset will
+// be rebuilt with the new target frame.
 
-    $selected_db = 0;
+$img_plus = '<img id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"' 
+    .' width="9" height="9" alt="+" />';
+$img_minus = '<img id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"' 
+    .' width="9" height="9" alt="-" />';
 
-    // natural order for db list; but do not sort if user asked
-    // for a specific order with the 'only_db' mechanism
+$href_left = '<a onclick="if ( toggle(\'%d\') ) return false;"'
+    .' href="left.php?%s" target="_self">';
 
-    if (!is_array($cfg['Server']['only_db']) && $cfg['NaturalOrder'] && $num_dbs > 0) {
-        $dblist_temp = $dblist;
-        natsort($dblist_temp);
-        $i = 0;
-        foreach ($dblist_temp as $each) {
-            $dblist[$i] = $each;
-            $i++;
-        }
+$element_counter = 0;
+
+if ( $GLOBALS['cfg']['LeftFrameLight'] && ! empty( $db ) ) {
+    $common_url_query = PMA_generate_common_url( $db );
+    $table_list = PMA_getTableList( $db );
+    if ( count( $table_list ) > 0 ) {
+        PMA_displayTableList( $table_list, true, '', $db );
+    } else {
+        echo $strNoTablesFound;
     }
+    unset( $table_list );
+} elseif ( $GLOBALS['cfg']['LeftFrameLight'] ) {
+    echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n";
+} else {
+    $common_url_query = PMA_generate_common_url();
+    PMA_displayDbList( PMA_getDbList() );
+}
 
-    // Gets the tables list per database
-    for ($i = 0; $i < $num_dbs; $i++) {
-        $db = $dblist[$i];
-        $j  = $i + 2;
-        if (!empty($db_start) && $db == $db_start) {
-            $selected_db = $j;
-        }
-        /**
-         * The query below will return a result set with a single field under
-         * MySQL versions before 5.0 and one with two fields under MySQL 5.0
-         * and above. The MySQL 5 result set also includes the table type
-         * ('BASE TABLE', 'VIEW' or 'TEMPORARY').
-         * MySQL 4 does neither know about views nor differ between permanent
-         * and temporary tables, so the table type is irrelevant here.
-         */
-        $tables              = PMA_DBI_try_query('SHOW ' . (PMA_MYSQL_INT_VERSION >= 50000 ? 'FULL ' : '') . 'TABLES FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE);
-        $num_tables          = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
-        $common_url_query    = PMA_generate_common_url($db);
-        if ($num_tables) {
-            $num_tables_disp = $num_tables;
-        } else {
-            $num_tables_disp = '-';
-        }
-
-        // Get additional information about tables for tooltip
-        if ($cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303
-            && $num_tables
-            && (!$cfg['LeftFrameLight'] || $selected_db == $j)) {
-            $tooltip = array();
-            $tooltip_name = array();
-            $result  = PMA_DBI_try_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db));
-            while ($tmp = PMA_DBI_fetch_assoc($result)) {
-                $tooltip_name[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '');
-                $tmp['Comment'] = ($cfg['ShowTooltipAliasTB'] && $cfg['ShowTooltipAliasTB'] !== 'nested' ? $tmp['Name'] : $tmp['Comment']);
-
-                $tooltip[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '')
-                                       . '(' . (isset($tmp['Rows']) ? $tmp['Rows'] : '0') . ' ' . $strRows . ')';
-            } // end while
-        } // end if
-
-        // garvin: Get comments from PMA comments table
-        $db_tooltip = '';
-        if ($cfg['ShowTooltip'] && $cfgRelation['commwork']) {
-            $tmp_db_tooltip = PMA_getComments($db);
-            if (is_array($tmp_db_tooltip)) {
-                $db_tooltip = implode(' ', $tmp_db_tooltip);
+/**
+ * displays collapsable db list
+ * 
+ * @uses    $_REQUEST['dbgroup']
+ * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
+ * @uses    $GLOBALS['strSelectADb']
+ * @uses    strpos()
+ * @uses    urlencode()
+ * @uses    printf()
+ * @uses    htmlspecialchars()
+ * @uses    PMA_generate_common_url()
+ * @uses    PMA_getTableList()
+ * @uses    PMA_displayTableList()
+ * @global  $element_counter
+ * @global  $img_minus
+ * @global  $img_plus
+ * @global  $href_left
+ * @global  $num_dbs
+ * @global  $db_start
+ * @global  $common_url_query
+ * @param   array   $ext_dblist extended db list
+ */
+function PMA_displayDbList( $ext_dblist ) {
+    global $element_counter, $img_minus, $img_plus, $href_left, $num_dbs,
+        $db_start, $common_url_query;
+    
+    $url_dbgroup = '';
+    echo '<ul id="leftdatabaselist">';
+    $close_db_group = false;
+    foreach ( $ext_dblist as $group => $db_group ) {
+        if ( $num_dbs > 1 ) {
+            if ( $close_db_group ) {
+                $url_dbgroup = '';
+                echo '</ul>';
+                echo '</li>';
+                $close_db_group = false;
+            }
+            if ( count( $db_group ) > 1 ) {
+                $close_db_group = true;
+                $url_dbgroup = '&amp;dbgroup=' . urlencode( $group );
+                $common_url_query = PMA_generate_common_url() . $url_dbgroup;
+                $element_counter++;
+                echo '<li class="dbgroup">';
+                if ( ( ! empty( $_REQUEST['dbgroup'] ) && $_REQUEST['dbgroup'] == $group ) 
+                  || $db_start == $group || strpos( $db_start, $group ) === 0 ) {
+                    // display + only if this db(group) is not preselected
+                    printf( $href_left, $element_counter, PMA_generate_common_url() );
+                    printf( $img_minus, $element_counter );
+                } else {
+                    printf( $href_left, $element_counter, $common_url_query );
+                    printf( $img_plus, $element_counter );
+                }
+                echo '</a> ' . $group . "\n";
+                if ( ( ! empty( $_REQUEST['dbgroup'] ) && $_REQUEST['dbgroup'] == $group ) 
+                  || $db_start == $group || strpos( $db_start, $group ) === 0 ) {
+                    echo '<ul id="subel' . $element_counter . '">' . "\n";
+                } else {
+                    echo '<ul id="subel' . $element_counter . '"'
+                        .' style="display: none">' . "\n";
+                }
             }
         }
-
-        // No light mode -> displays the expandible/collapsible db list
-        if ($cfg['LeftFrameLight'] == FALSE) {
-
+        foreach ( $db_group as $db ) {
+            $common_url_query = PMA_generate_common_url( $db['name'] ) . $url_dbgroup;
+    
+            $element_counter++;
             // Displays the database name
-            $on_mouse = (($cfg['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"');
-
-            echo "\n";
-            echo '    <div id="el' . $j . 'Parent" class="parent nowrap"' . $on_mouse . '>';
-
-            if (!empty($num_tables)) {
-                echo "\n";
-            ?>
-            <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', true); return false} else {return true}">
-            <img name="imEx" id="el<?php echo $j; ?>Img" src="<?php echo $pmaThemeImage; ?>b_plus.png" border="0" width="9" height="9" alt="+" /></a>
-            <?php
-            } else {
-                echo "\n";
-            ?>
-            <img name="imEx" src="<?php echo $pmaThemeImage; ?>b_minus.png" border="0" width="9" height="9" alt="-" />
-            <?php
-            }
-            echo "\n";
-            ?>
-            <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}">
-            <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a>
-        </div>
-
-        <div id="el<?php echo $j;?>Child" class="child nowrap" style="margin-bottom: 5px"<?php echo $on_mouse; ?>>
-        <?php
-            // Displays the list of tables from the current database
-            $tablestack  = array();
-            $table_array = array();
-            $table_types = array();
-            while (@list($table, $type) = PMA_DBI_fetch_row($tables)) {
-                $table_item = (!empty($tooltip_name) && isset($tooltip_name[$table]) && !empty($tooltip_name[$table]) && $cfg['ShowTooltipAliasTB'] && strtolower($cfg['ShowTooltipAliasTB']) !== 'nested'
-                            ? htmlspecialchars($tooltip_name[$table])
-                            : htmlspecialchars($table));
-                $table_array[$table] = $table_item;
-                $table_types[$table] = empty($type) ? 'BASE TABLE' : $type;
-            }
-
-            if ($cfg['NaturalOrder']) {
-                natsort($table_array);
-            }
-
-            $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
-            foreach ($table_array as $table => $table_sortkey) {
-                $alias = (!empty($tooltip_name) && isset($tooltip_name[$table]))
-                           ? htmlspecialchars($tooltip_name[$table])
-                           : '';
-                $url_title = (!empty($tooltip) && isset($tooltip[$table]))
-                           ? htmlspecialchars($tooltip[$table])
-                           : '';
-                $table_item = ($alias != '' && $cfg['ShowTooltipAliasTB'] && strtolower($cfg['ShowTooltipAliasTB']) !== 'nested'
-                            ? $alias
-                            : htmlspecialchars($table));
-                $tablename = ($alias != '' && $cfg['ShowTooltipAliasTB']
-                           ? $alias
-                           : htmlspecialchars($table));
-
-                $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
-
-                $list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
-                $list_item .= '<img src="' . $pmaThemeImage . ($table_types[$table] == 'VIEW' ? 's_views' : 'b_sbrowse') . '.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
-                $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
-                $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
-                $list_item .= $table_item . '</a><br />' . "\n";
-
-                // garvin: Check whether to display nested sets
-                if (!empty($cfg['LeftFrameTableSeparator'])) {
-                    $_table = explode($cfg['LeftFrameTableSeparator'],  str_replace('\'', '\\\'', $tablename));
-                    if (is_array($_table)) {
-                        foreach ($_table AS $key => $val) {
-                            if ($val == '') {
-                                $_table[$key] = '__protected__';
-                            }
-                        }
-                        PMA_reduceNest($_table);
-
-                        if (count($_table) == 1) {
-                            array_unshift($_table, '');
-                        }
-                        PMA_multimerge($tablestack, $_table);
-                    } else {
-                        $tablestack['']['pma_name'][] = $table_item;
-                        $tablestack['']['pma_list_item'][] = $list_item;
-                    }
+            echo '<li>' . "\n";
+            
+            if ( $num_dbs > 1 ) {
+                // only with more than one db we need collapse ...
+                if ( $db_start != $db['name'] || $db['num_tables'] < 1 ) {
+                    // display + only if this db is not preselected
+                    // or table count is 0
+                    printf( $href_left, $element_counter, $common_url_query );
+                    printf( $img_plus, $element_counter );
                 } else {
-                    $tablestack['']['pma_name'][] = $table_item;
-                    $tablestack['']['pma_list_item'][] = $list_item;
+                    printf( $href_left, $element_counter,
+                        PMA_generate_common_url() . $url_dbgroup );
+                    printf( $img_minus, $element_counter );
                 }
-            } // end while (tables list)
-
-            PMA_nestedSet($j, $tablestack);
-        ?>
-        </div>
-        <?php
-            echo "\n";
-        }
-
-        // Light mode -> displays the select combo with databases names and the
-        // list of tables contained in the current database
-        else {
-            echo "\n";
-
-            // Builds the databases' names list
-            if (!empty($db_start) && $db == $db_start) {
-                $table_title = array();
-                $table_array = array();
-                // Gets the list of tables from the current database
-                $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
-                while (@list($table, $type) = PMA_DBI_fetch_row($tables)) {
-                    $table_array[$table] = '';
-                    $url_title  = (!empty($tooltip) && isset($tooltip[$table]))
-                                ? htmlspecialchars($tooltip[$table])
-                                : '';
-                    $alias = (!empty($tooltip_name) && isset($tooltip_name[$table]))
-                               ? htmlspecialchars($tooltip_name[$table])
-                               : '';
-
-                    $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
-
-                    // natural order or not, use an array for the table list
-
-                    $table_array[$table] .= '    <div class="nowrap"><a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '">' . "\n";
-                    $table_array[$table] .= '              <img src="' . $pmaThemeImage . (!empty($type) && $type == 'VIEW' ? 's_views' : 'b_sbrowse') . '.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" title="' . $strBrowse . ': ' . $url_title . '" /></a><bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
-
-                    if (PMA_USR_BROWSER_AGENT == 'IE') {
-                        $table_array[$table] .= '          <span class="tblItem"><a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></span></div>' . "\n";
-                    } else {
-                        $table_array[$table] .= '          <a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></div>' . "\n";
-                    }
-
-                    $table_title[$table] = htmlspecialchars($table);
-
-                } // end while (tables list)
-
-                if (count($table_title) > 0) {
-                    if ($cfg['NaturalOrder'] && $num_tables > 0) {
-                        natsort($table_title);
-                    }
-
-                    foreach ($table_title as $each_key => $each_val) {
-                        $table_list .= ' ' . $table_array[$each_key];
-                    }
-                } else {
-                    $table_list = '    <br /><br />' . "\n"
-                                . '    <div>' . $strNoTablesFound . '</div>' . "\n";
-                }
-                $selected = ' selected="selected"';
-
-                $table_list_header .= '    <a class="item" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabDatabase'] . '?' . $common_url_query . '">' . "\n";
-                $table_list_header .= '        <span class="heada"><b>' . ($db_tooltip != '' && $cfg['ShowTooltipAliasTB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)) . '</b><bdo dir="' . $text_dir . '">&nbsp;&nbsp;</bdo></span></a><br />' . "\n\n";
-            } else {
-                $selected = '';
-            } // end if... else...
-
-        } // end if (light mode)
-
-    } // end for $i (db list)
-
-    // Light mode -> end of the select combo for databases and table list for
-    // the current database
-    if ($cfg['LeftFrameLight']) {
-        if (!$table_list) {
-            $table_list = '    <div align="center"><b>' . $strSelectADb . '</b></div>' . "\n";
-        }
-
-        // Displays the current database name and the list of tables it
-        // contains
-
-        echo $table_list_header;
-        echo $table_list;
-    }
-
-    // No light mode -> initialize some js variables for the
-    // expandible/collapsible stuff
-    else {
-    ?>
-
-    <!-- Arrange collapsible/expandable db list at startup -->
-    <script type="text/javascript" language="javascript1.2">
-    <!--
-        if (isNS4) {
-            firstEl  = 'el1Parent';
-            firstInd = nsGetIndex(firstEl);
-            nsShowAll();
-            nsArrangeList();
-        }
-        var expandedDb = '<?php echo (empty($selected_db)) ? '' : 'el' . $selected_db . 'Child'; ?>';
-    //-->
-    </script>
-    <?php
-
-    } // end if... else... (light mode)
-
-} // end if ($server > 1)
-
-
-// Case where only one database has to be displayed
-else if ($num_dbs == 1) {
-    $db                  = $dblist[0];
-    $tables              = PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', NULL, PMA_DBI_QUERY_STORE);
-    $num_tables          = ($tables) ? @PMA_DBI_num_rows($tables) : 0;
-    $common_url_query    = PMA_generate_common_url($db);
-    if ($num_tables) {
-        $num_tables_disp = $num_tables;
-    } else {
-        $num_tables_disp = '-';
-    }
-
-    // Get additional infomation about tables for tooltip
-    if ($cfg['ShowTooltip'] && PMA_MYSQL_INT_VERSION >= 32303
-        && $num_tables) {
-        $tooltip = array();
-        $tooltip_name = array();
-        $result  = PMA_DBI_try_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db), NULL, PMA_DBI_QUERY_STORE);
-        while ($tmp = PMA_DBI_fetch_assoc($result)) {
-            $tooltip_name[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '');
-            $tmp['Comment'] = ($cfg['ShowTooltipAliasTB'] && $cfg['ShowTooltipAliasTB'] !== 'nested' ? $tmp['Name'] : $tmp['Comment']);
-
-            $tooltip[$tmp['Name']] = (!empty($tmp['Comment']) ? $tmp['Comment'] . ' ' : '')
-                                   . '(' . (isset($tmp['Rows']) ? $tmp['Rows'] : '0') . ' ' . $strRows . ')';
-        } // end while
-    } // end if
-
-    // garvin: Get comments from PMA comments table
-    $db_tooltip = '';
-    if ($cfg['ShowTooltip'] && $cfgRelation['commwork']) {
-        $tmp_db_tooltip = PMA_getComments($db);
-        if (is_array($tmp_db_tooltip)) {
-            $db_tooltip = implode(' ', $tmp_db_tooltip);
-        }
-    }
-
-
-    // Displays the database name
-    if (!$cfg['LeftFrameLight']) {
-            $on_mouse = (($cfg['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftBgColor'] . '\')}"');
-
-            echo "\n";
-            echo '    <div id="el2Parent" class="parent"' . $on_mouse . '>';
-
-            if (!empty($num_tables)) {
-                echo "\n";
+                echo '</a>';
+                
+                // ... and we need to refresh both frames on db selection
                 ?>
-        <div class="nowrap"><a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el2', true); return false} else {return true}">
-            <img name="imEx" id="el2Img" src="<?php echo $pmaThemeImage; ?>b_plus.png" border="0" width="9" height="9" alt="+" /></a>
+                <a class="item"
+                    id="<?php echo $db['name']; ?>"
+                    href="index.php?<?php echo $common_url_query; ?>"
+                    target="_parent" 
+                    title="<?php echo htmlspecialchars( $db['comment'] ); ?>" 
+                    onclick="
+                        if ( ! toggle('<?php echo $element_counter; ?>', true) )
+                            goTo( './left.php?<?php echo $common_url_query; ?>' );
+                        goTo( './<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
+                            . '?' . $common_url_query; ?>', 'main' );
+                        return false;">
+                    <?php echo htmlspecialchars( $db['disp_name'] ); ?>
+                    (<?php echo $db['num_tables']; ?>)
+                </a>
                 <?php
             } else {
-                echo "\n";
+                // with only 1 db available we dont need to refresh left frame
+                // on db selection, only phpmain
                 ?>
-        <div class="nowrap"><img name="imEx" src="<?php echo $pmaThemeImage; ?>b_minus.png" border="0" width="9" height="9" alt="-" />
+                <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
+                    . '?' . $common_url_query; ?>"
+                    id="<?php echo $db['name']; ?>"
+                    title="<?php echo htmlspecialchars( $db['comment'] ); ?>">
+                    <?php echo htmlspecialchars( $db['disp_name'] ); ?>
+                    (<?php echo $db['num_tables']; ?>)
+                </a>
                 <?php
             }
-            echo "\n";
-            ?>
-        <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el2', false)}">
-            <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></div>
-    </div>
-
-    <div id="el2Child" class="child" style="margin-bottom: 5px"<?php echo $on_mouse; ?>>
-    <?php
-    } else {
-        echo "\n";
-        ?>
-    <div id="el2Parent" class="parent nowrap">
-        <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>">
-            <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a>
-    </div>
-    <div id="el2Child" class="child nowrap" style="margin-bottom: 5px">
-        <?php
-    }
-
-    // Displays the list of tables from the current database
-    $tablestack = array();
-    $table_array = array();
-    while (list($table) = PMA_DBI_fetch_row($tables)) {
-        $table_item = (!empty($tooltip_name) && isset($tooltip_name[$table]) && !empty($tooltip_name[$table]) && $cfg['ShowTooltipAliasTB'] && strtolower($cfg['ShowTooltipAliasTB']) !== 'nested'
-                    ? htmlspecialchars($tooltip_name[$table])
-                    : htmlspecialchars($table));
-        $table_array[$table] = $table_item;
-    }
-
-    if ($cfg['NaturalOrder']) {
-        natcasesort($table_array);
-    }
-
-    $book_sql_cache = PMA_queryDBBookmarks($db, $cfg['Bookmark'], $table_array);
-    foreach ($table_array as $table => $table_sortkey) {
-        $alias = (!empty($tooltip_name) && isset($tooltip_name[$table]))
-                   ? htmlspecialchars($tooltip_name[$table])
-                   : '';
-        $url_title = (!empty($tooltip) && isset($tooltip[$table]))
-                   ? htmlspecialchars($tooltip[$table])
-                   : '';
-        $table_item = ($alias != '' && $cfg['ShowTooltipAliasTB'] && strtolower($cfg['ShowTooltipAliasTB']) !== 'nested'
-                    ? $alias
-                    : htmlspecialchars($table));
-        $tablename = ($alias != '' && $cfg['ShowTooltipAliasTB']
-                   ? $alias
-                   : htmlspecialchars($table));
-
-        $book_sql_query = (isset($book_sql_cache[$table]) ? $book_sql_cache[$table] : FALSE);
-
-        if ($cfg['LeftFrameLight']) {
-        echo "\n";
-        ?>
-            <a target="phpmain<?php echo $hash; ?>" href="sql.php?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))); ?>&amp;pos=0&amp;goto=<?php echo $cfg['DefaultTabTable']; ?>" title="<?php echo $strBrowse . ': ' . $url_title; ?>">
-                  <img src="<?php echo $pmaThemeImage . 'b_sbrowse.png'; ?>" width="10" height="10" border="0" alt="<?php echo $strBrowse . ': ' . $url_title; ?>" /></a><bdo dir="<?php echo $text_dir; ?>">&nbsp;</bdo>
-              <a class="tblItem" id="tbl_<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain<?php echo $hash; ?>" href="<?php echo $cfg['DefaultTabTable']; ?>?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>">
-                  <?php echo $table_item; ?></a><br />
-        <?php
-        } else {
-            $list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
-            $list_item .= '<img src="' . $pmaThemeImage . 'b_sbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
-            $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
-            $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
-            $list_item .= $table_item . '</a><br />';
-
-            // garvin: Check whether to display nested sets
-            if (!empty($cfg['LeftFrameTableSeparator'])) {
-                $_table = explode($cfg['LeftFrameTableSeparator'],  str_replace('\'', '\\\'', $tablename));
-                if (is_array($_table)) {
-                    foreach ($_table AS $key => $val) {
-                        if ($val == '') {
-                            $_table[$key] = '__protected__';
-                        }
-                    }
-                    PMA_reduceNest($_table);
-
-                    if (count($_table) == 1) {
-                        array_unshift($_table, '');
-                    }
-                    PMA_multimerge($tablestack, $_table);
-                } else {
-                    $tablestack['']['pma_name'][] = $table_item;
-                    $tablestack['']['pma_list_item'][] = $list_item;
-                }
-            } else {
-                $tablestack['']['pma_name'][] = $table_item;
-                $tablestack['']['pma_list_item'][] = $list_item;
+            if ( $db['num_tables'] ) {                
+                $tables = PMA_getTableList( $db['name'] );
+                $child_visible =
+                    (bool) ($num_dbs === 1 || $db_start == $db['name']);
+                PMA_displayTableList( $tables, $child_visible, '', $db['name'] );
+            } elseif ( $GLOBALS['cfg']['LeftFrameLight'] ) {
+                // no tables and LeftFrameLight:
+                // display message no tables in selected db
+                echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n";
             }
-        }
-    } // end for $j (tables list)
-
-    if (!$cfg['LeftFrameLight']) {
-        PMA_nestedSet('1', $tablestack);
-        ?>
-    </div>
-    <!-- Arrange collapsible/expandable db list at startup -->
-    <script type="text/javascript" language="javascript1.2">
-    <!--
-    if (isNS4) {
-      firstEl  = 'el1Parent';
-      firstInd = nsGetIndex(firstEl);
-      nsShowAll();
-      nsArrangeList();
+            echo '</li>' . "\n";
+        } // end foreach db
+    } // end foreach group
+    
+    if ( $close_db_group ) {
+        $url_dbgroup = '';
+        echo '</ul>';
+        echo '</li>';
+        $close_db_group = false;
     }
-    var expandedDb = '<?php echo (empty($selected_db)) ? '' : 'el' . $selected_db . 'Child'; ?>';
-    //-->
-    </script>
-        <?php
+    
+    echo '</ul>' . "\n";
+}
+
+/**
+ * display unordered list of tables
+ * calls itself recursively if table in given list
+ * is a list itself
+ * 
+ * @uses    is_array()
+ * @uses    count()
+ * @uses    urlencode()
+ * @uses    strpos()
+ * @uses    printf()
+ * @uses    htmlspecialchars()
+ * @uses    strlen()
+ * @uses    is_array()
+ * @uses    PMA_displayTableList()
+ * @uses    $_REQUEST['tbl_group']
+ * @uses    $GLOBALS['common_url_query']
+ * @uses    $GLOBALS['table']
+ * @uses    $GLOBALS['pmaThemeImage']
+ * @uses    $GLOBALS['cfg']['LeftFrameTableSeparator']
+ * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
+ * @uses    $GLOBALS['cfg']['DefaultTabTable']
+ * @uses    $GLOBALS['strRows']
+ * @uses    $GLOBALS['strBrowse']
+ * @global  $element_counter
+ * @global  $img_minus
+ * @global  $img_plus
+ * @global  $href_left
+ * @param   array   $tables         array of tables/tablegroups
+ * @param   boolean $visible        wether the list is visible or not
+ * @param   string  $tab_group_full full tab group name
+ * @param   string  $table_db       db of this table
+ */
+function PMA_displayTableList( $tables, $visible = false,
+    $tab_group_full = '', $table_db = '' ) {
+    
+    if ( ! is_array( $tables ) || count( $tables ) === 0 ) {
+        return;
+    }
+    
+    global $element_counter, $img_minus, $img_plus, $href_left;
+    $sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
+    
+    if ( $visible ) {
+        echo '<ul id="subel' . $element_counter . '">';
     } else {
-        echo '    </div>';
+        echo '<ul id="subel' . $element_counter . '" style="display: none">';
     }
-
-    echo "\n";
-} // end if ($num_dbs == 1)
-
-
-// Case where no database has to be displayed
-else {
-    echo "\n";
-    echo '<p>' . $strNoDatabases . '</p>';
-} // end if ($num_dbs == 0)
-echo "\n";
-
-// 2004-08-05 added by Michael Keck
-//            reload queryframe if it exists and we delete a database
-//            or select a database from the db_list.
-$my_lightm_db = '';
-if (isset($lightm_db) && $lightm_db!='') {
-    $my_lightm_db = $lightm_db;
-}
-
-if ($cfg['LeftFrameLight'] && $cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
-    if (!isset($table_array) || count($table_array)==0) {
-        $my_url_query = PMA_generate_common_url('', '', '&');
-?>
-<script language="JavaScript" type="text/javascript">
-<!--
-function check_queryframe_reload() {
-    if (typeof(window.parent.frames['queryframe'])!='undefined' && typeof(window.parent.frames['queryframe'].document.forms['left'])!='undefined') {
-        if (window.parent.frames['queryframe'].document.forms['left'].elements['lightm_db'].value!='<?php echo $my_lightm_db; ?>') {
-            window.parent.frames['queryframe'].location.replace('<?php echo 'queryframe.php?' . $my_url_query . '&hash=' . $hash; ?>');
+    foreach( $tables as $group => $table ) {
+        if ( isset( $table['is' . $sep . 'group'] ) ) {
+            $common_url_query = $GLOBALS['common_url_query'] 
+                . '&amp;tbl_group=' . urlencode( $tab_group_full . $group );
+                
+            $element_counter++;
+            echo '<li>' . "\n";
+            if ( $visible && 
+              (( isset( $_REQUEST['tbl_group'] )
+                && ( strpos( $_REQUEST['tbl_group'], $group ) === 0
+                || strpos( $_REQUEST['tbl_group'], $sep . $group ) !== false ) )
+              ||
+              ( isset( $GLOBALS['table'] )
+                && strpos( $GLOBALS['table'], $group ) === 0 ) ) ) {
+                printf( $href_left, $element_counter,
+                    $GLOBALS['common_url_query'] . '&amp;tbl_group=' . $tab_group_full );
+                printf( $img_minus, $element_counter );
+            } else {
+                printf( $href_left, $element_counter, $common_url_query );
+                printf( $img_plus, $element_counter );
+            }
+            echo '</a>';
+            
+            ?>
+            <a href="index.php?<?php echo $common_url_query; ?>"
+                target="_parent" 
+                onclick="
+                    if ( ! toggle('<?php echo $element_counter; ?>', true) )
+                        goTo( './left.php?<?php echo $common_url_query; ?>' );
+                    goTo( './<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
+                        . '?' . $common_url_query; ?>', 'main' );
+                    return false;">
+                <?php echo htmlspecialchars( substr( $group, 0, strlen( $group ) - strlen( $sep ) ) ); ?>
+                (<?php echo $table['tab_count']; ?>)
+            </a>
+            <?php
+            
+            unset( $table['is' . $sep . 'group'] );
+            unset( $table['tab' . $sep . 'group'] );
+            unset( $table['tab' . $sep . 'count'] );
+            
+            if ( $visible && 
+              (( isset( $_REQUEST['tbl_group'] )
+                && ( strpos( $_REQUEST['tbl_group'], $group ) === 0
+                || strpos( $_REQUEST['tbl_group'], $sep . $group ) !== false ) )
+              ||
+              ( isset( $GLOBALS['table'] )
+                && strpos( $GLOBALS['table'], $group ) === 0 ) ) ) {
+                PMA_displayTableList( $table, true,
+                    $tab_group_full . $group, $table_db );
+            } else {
+                PMA_displayTableList( $table, false, '', $table_db );
+            }
+            echo '</li>' . "\n";
+        } elseif ( is_array( $table ) ) {
+            $href = $GLOBALS['cfg']['DefaultTabTable'] . '?' 
+                .$GLOBALS['common_url_query'] . '&amp;table=' 
+                .urlencode( $table['Name'] );
+            echo '<li>' . "\n";
+            echo '<a title="' . $GLOBALS['strBrowse'] . ': ' 
+                . htmlspecialchars( $table['Comment'] )
+                .' (' . $table['Rows'] . ' ' . $GLOBALS['strRows'] . ')"'
+                .' id="' . htmlspecialchars( $table_db . '.' . $table['Name'] ) . '"'
+                .' href="sql.php?' . $GLOBALS['common_url_query'] 
+                .'&amp;table=' . urlencode( $table['Name'] )
+                .'&amp;goto=' . $GLOBALS['cfg']['DefaultTabTable']
+                .'&amp;sql_query=' . urlencode('SELECT * FROM `' 
+                . $table['Name'] . '`') . '" '
+                .' >'
+                .'<img src="' . $GLOBALS['pmaThemeImage'] . 'b_sbrowse.png"'
+                .' width="10" height="10" alt="*" /></a>' . "\n"
+                .'<a href="' . $href . '" title="' . $table['Comment']
+                .' (' . $table['Rows'] . ' ' . $GLOBALS['strRows'] . ')">'
+                . htmlspecialchars( $table['disp_name'] ) . '</a>';
+            echo '</li>' . "\n";
         }
     }
-}
-// This is a workaround for the problem in Safari 1.2.3 where the
-// top left frame does not load.
-// If we call this right away it usually prevents the top-left frame from
-// loading in Safari, so call it delayed. -Ryan Schmidt 2004-08-15
-setTimeout('check_queryframe_reload()', 1000);
-
-//-->
-</script>
-<?php
-    }
+    echo '</ul>' . "\n";
 }
 ?>
 </div>
 </body>
 </html>
-
 <?php
 /**
  * Close MySql connections
@@ -838,12 +573,10 @@ if (isset($userlink) && $userlink) {
     @PMA_DBI_close($userlink);
 }
 
-
 /**
  * Sends bufferized data
  */
-if (isset($cfg['OBGzip']) && $cfg['OBGzip']
-    && isset($ob_mode) && $ob_mode) {
-     PMA_outBufferPost($ob_mode);
+if ( $GLOBALS['cfg']['OBGzip'] && isset( $ob_mode ) && $ob_mode ) {
+     PMA_outBufferPost( $ob_mode );
 }
 ?>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 2e007f1bd..ec628364f 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -801,6 +801,10 @@ if ($is_minimum_common == FALSE) {
  * @uses    PMA_getTableCount()
  * @uses    PMA_getComments()
  * @uses    PMA_availableDatabases()
+ * @uses    is_array()
+ * @uses    implode()
+ * @uses    strstr()
+ * @uses    explode()
  * @return  array   db list
  */
 function PMA_getDbList() {
@@ -860,8 +864,8 @@ function PMA_getDbList() {
  */
 function PMA_getHtmlSelectDb( $selected = '' ) {
     $dblist = PMA_getDbList();
-    $return = '<select name="lightm_db" id="lightm_db"'
-        .' onchange="remove_focus_select(); this.form.submit();">' . "\n"
+    $return = '<select name="db" id="lightm_db"'
+        .' onchange="this.form.submit();">' . "\n"
         .'<option value="">(' . $GLOBALS['strDatabases'] . ') ...</option>'
         ."\n";
     foreach( $dblist as $group => $dbs ) {
@@ -1549,34 +1553,130 @@ if ($is_minimum_common == FALSE) {
         global $num_dbs;
         global $cfg;
 
-        $num_dbs = count($dblist);
-
         // 1. A list of allowed databases has already been defined by the
         //    authentification process -> gets the available databases list
-        if ($num_dbs) {
-            $true_dblist = array();
-            for ($i = 0; $i < $num_dbs; $i++) {
-                $dblink  = @PMA_DBI_select_db($dblist[$i]);
-                if ($dblink) {
-                    $true_dblist[] = $dblist[$i];
+        if ( count( $dblist ) ) {
+            foreach ( $dblist as $key => $db ) {
+                if ( ! @PMA_DBI_select_db( $db ) ) {
+                    unset( $dblist[$key] );
                 } // end if
             } // end for
-            $dblist      = array();
-            $dblist      = $true_dblist;
-            unset($true_dblist);
-            $num_dbs     = count($dblist);
         } // end if
         // 2. Allowed database list is empty -> gets the list of all databases
         //    on the server
-        else if (!isset($cfg['Server']['only_db']) || $cfg['Server']['only_db'] == '') {
+        elseif ( empty( $cfg['Server']['only_db'] ) ) {
             $dblist = PMA_DBI_get_dblist(); // needed? or PMA_mysqlDie('', 'SHOW DATABASES;', FALSE, $error_url);
-            $num_dbs = count($dblist);
         } // end else
 
+        $num_dbs = count( $dblist );
+        
+        // natural order for db list; but do not sort if user asked
+        // for a specific order with the 'only_db' mechanism
+        if ( ! is_array( $GLOBALS['cfg']['Server']['only_db'] )
+            && $GLOBALS['cfg']['NaturalOrder'] ) {
+            natsort( $dblist );
+        }
+        
         return TRUE;
     } // end of the 'PMA_availableDatabases()' function
 
+    /**
+     * returns array with tables of given db with extended infomation and grouped
+     * 
+     * @uses    $GLOBALS['cfg']['LeftFrameTableSeparator']
+     * @uses    $GLOBALS['cfg']['LeftFrameTableLevel']
+     * @uses    $GLOBALS['cfg']['ShowTooltipAliasTB']
+     * @uses    $GLOBALS['cfg']['NaturalOrder']
+     * @uses    PMA_DBI_fetch_result()
+     * @uses    PMA_backquote()
+     * @uses    count()
+     * @uses    array_merge
+     * @uses    uksort()
+     * @uses    strstr()
+     * @uses    explode()
+     * @param   string  $db     name of db
+     * return   array   (rekursive) grouped table list
+     */
+    function PMA_getTableList( $db ) {
+        $sep = $GLOBALS['cfg']['LeftFrameTableSeparator'];
+        
+        $tables = PMA_DBI_fetch_result(
+            'SHOW TABLE STATUS FROM ' . PMA_backquote( $db ),
+            'Name' );
+        if ( count( $tables ) < 1 ) {
+            return $tables;
+        }
+        
+        if ( $GLOBALS['cfg']['NaturalOrder'] ) {
+            uksort( $tables, 'strcmp' );
+        }
+        
+        $default = array(
+            'Name'      => '',
+            'Rows'      => 0,
+            'Comment'   => '',
+            'disp_name' => '',
+        );
+        
+        $table_groups = array();
+        
+        foreach ( $tables as $table_name => $table ) {
+            // in $group we save the reference to the place in $table_groups
+            // where to store the table info
+            if ( $GLOBALS['cfg']['LeftFrameDBTree']
+                && $sep && strstr( $table_name, $sep ) )
+            {
+                $parts = explode( $sep, $table_name );
+                                  
+                $group =& $table_groups;
+                $i = 0;
+                $group_name_full = '';
+                while ( $i < count( $parts ) - 1
+                  && $i < $GLOBALS['cfg']['LeftFrameTableLevel'] ) {
+                    $group_name = $parts[$i] . $sep;
+                    $group_name_full .= $group_name;
+                    
+                    if ( ! isset( $group[$group_name] ) ) {
+                        $group[$group_name] = array();
+                        $group[$group_name]['is' . $sep . 'group'] = true;
+                        $group[$group_name]['tab' . $sep . 'count'] = 1;
+                        $group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
+                    } elseif ( ! isset( $group[$group_name]['is' . $sep . 'group'] ) ) {
+                        $table = $group[$group_name];
+                        $group[$group_name] = array();
+                        $group[$group_name][$group_name] = $table;
+                        unset( $table );
+                        $group[$group_name]['is' . $sep . 'group'] = true;
+                        $group[$group_name]['tab' . $sep . 'count'] = 1;
+                        $group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
+                    } else {
+                        $group[$group_name]['tab_count']++;
+                    }
+                    $group =& $group[$group_name];
+                    $i++;
+                }
+            } else {
+                if ( ! isset( $table_groups[$table_name] ) ) {
+                    $table_groups[$table_name] = array();
+                }
+                $group =& $table_groups;
+            }
+            
+        
+            if ( $GLOBALS['cfg']['ShowTooltipAliasTB']
+              && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested' ) {
+                // switch tooltip and name
+                $table['Comment'] = $table['Name'];
+                $table['disp_name'] = $table['Comment'];
+            } else {
+                $table['disp_name'] = $table['Name'];
+            }
+            
+            $group[$table_name] = array_merge( $default, $table );
+        }
 
+        return $table_groups;
+    }
 
     /* ----------------------- Set of misc functions ----------------------- */
 
@@ -1734,8 +1834,8 @@ if ($is_minimum_common == FALSE) {
 <script type="text/javascript" language="javascript1.2">
 <!--
 if (typeof(window.parent) != 'undefined'
-    && typeof(window.parent.frames['nav']) != 'undefined') {
-    window.parent.frames['nav'].goTo('<?php echo $reload_url; ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
+    && typeof(window.parent.frames[0]) != 'undefined') {
+    window.parent.frames[0].goTo('<?php echo $reload_url; ?>');
 }
 //-->
 </script>
@@ -1770,18 +1870,18 @@ if (typeof(window.parent) != 'undefined'
                             : $tbl_status['Comment'] . ' ';
                 $tooltip .= '(' . $tbl_status['Rows'] . ' ' . $GLOBALS['strRows'] . ')';
                 PMA_DBI_free_result($result);
-                $md5_tbl = md5($GLOBALS['table']);
+                $uni_tbl = PMA_jsFormat( $GLOBALS['db'] . '.' . $GLOBALS['table'] );
                 echo "\n";
                 ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
 if (typeof(document.getElementById) != 'undefined'
-    && typeof(window.parent.frames['nav']) != 'undefined'
-    && typeof(window.parent.frames['nav'].document) != 'undefined' && typeof(window.parent.frames['nav'].document) != 'unknown'
-    && (window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>'))
-    && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>')) != 'undefined'
-    && typeof(window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title) == 'string') {
-    window.parent.frames['nav'].document.getElementById('<?php echo 'tbl_' . $md5_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>';
+    && typeof(window.parent.frames[0]) != 'undefined'
+    && typeof(window.parent.frames[0].document) != 'undefined' && typeof(window.parent.frames[0].document) != 'unknown'
+    && (window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>'))
+    && typeof(window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>')) != 'undefined'
+    && typeof(window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>').title) == 'string') {
+    window.parent.frames[0].document.getElementById('<?php echo $uni_tbl; ?>').title = '<?php echo PMA_jsFormat($tooltip, FALSE); ?>';
 }
 //-->
 </script>
diff --git a/libraries/left_header.inc.php b/libraries/left_header.inc.php
index 5ee82bb8b..2da6fdad5 100644
--- a/libraries/left_header.inc.php
+++ b/libraries/left_header.inc.php
@@ -19,10 +19,10 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
     $logo = 'phpMyAdmin';
     if ( @file_exists( $GLOBALS['pmaThemeImage'] . 'logo_left.png' ) ) {
         $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'logo_left.png" '
-            .'alt="' . $logo . '" />';
+            .'alt="' . $logo . '" id="imgpmalogo" />';
     } elseif ( @file_exists( $GLOBALS['pmaThemeImage'] . 'pma_logo2.png' ) ) {
         $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png" '
-            .'alt="' . $logo . '" />';
+            .'alt="' . $logo . '" id="imgpmalogo" />';
     }
     
     echo '<div id="pmalogo">' . "\n"
@@ -33,7 +33,7 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
 ?>
 <div id="leftframelinks">
 <?php
-    echo '<a href="main.php?' . $query_url . '" target="phpmain' . $hash . '"'
+    echo '<a href="main.php?' . $query_url . '"'
         .' title="' . $strHome . '">'
         .( $GLOBALS['cfg']['MainPageIconic']
             ? '<img src="' . $pmaThemeImage . 'b_home.png" width="16" '
@@ -68,7 +68,6 @@ if ( $GLOBALS['cfg']['LeftDisplayLogo'] ) {
                 $query_frame_link_text = $strQueryFrame;
             }
         echo '<a href="' . $anchor . '&amp;no_js=true"'
-            .' target="phpmain' . $hash . '"'
             .' title="' . $strQueryFrame . '"';
         if ( $GLOBALS['cfg']['QueryFrameJS'] ) {
             echo ' onclick="javascript:open_querywindow(\'' . $anchor . '\');'
@@ -94,22 +93,4 @@ if ( $GLOBALS['cfg']['LeftDisplayServers'] ) {
     $show_server_left = TRUE;
     include('./libraries/select_server.lib.php');
 } // end if LeftDisplayServers
-
-if ( $num_dbs > 1 && $cfg['LeftFrameLight'] ) {
-    ?>
-    <div id="databaseList">
-    <form method="post" action="index.php" name="left" target="_parent"
-        onclick="this.form.target='nav'; this.form.action='left.php'; return true;">
-    <input type="hidden" name="hash" value="<?php echo $hash; ?>" />
-    <label for="lightm_db"><?php echo $strDatabase; ?></label>
-    <?php
-    echo PMA_generate_common_hidden_inputs() . "\n";
-    echo PMA_getHtmlSelectDb( $db ) . "\n";
-    echo '<noscript>' . "\n"
-        .'<input type="submit" name="Go" value="' . $strGo . '" />' . "\n"
-        .'</noscript>' . "\n"
-        .'</form>' . "\n"
-        .'</div>' . "\n";
-
-}
-?>
+?>
\ No newline at end of file
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index e65c9b9dc..33f7acf84 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -111,7 +111,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
         <form method="post" id="sqlqueryform"
               target="phpmain<?php echo md5( $GLOBALS['cfg']['PmaAbsoluteUri'] ); ?>"
               action="import.php"<?php echo $enctype; ?> name="sqlform"
-              onsubmit="this.target=window.opener.parent.frames[2].name;
+              onsubmit="this.target=window.opener.parent.frames[1].name;
                         return checkSqlQuery(this);" >
         <?php
     } else {
diff --git a/queryframe.php b/queryframe.php
index 3a3b495ec..7e81651db 100644
--- a/queryframe.php
+++ b/queryframe.php
@@ -173,9 +173,6 @@ require 'libraries/left_header.inc.php';
     <input type="hidden" name="table" value="" />
     <input type="hidden" name="framename" value="queryframe" />
 </form>
-<form name="hashform" action="queryframe.php">
-    <input type="hidden" name="hash" value="<?php echo $hash; ?>" />
-</form>
 </body>
 </html>
 
diff --git a/querywindow.php b/querywindow.php
index 7ff371eec..434f6f6ba 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -70,6 +70,7 @@ var confirmMsg  = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '
 
 <?php
 if ( empty( $querydisplay_tab ) ) {
+    $onload = 'onload="resize();"';
 ?>
 function resize() {
     
@@ -95,6 +96,8 @@ function resize() {
     }
 }
 <?php
+} else {
+    $onload = '';
 }
 ?>
 //-->
@@ -102,7 +105,7 @@ function resize() {
 <script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
 </head>
 
-<body id="bodyquerywindow" onload="resize();" bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>">
+<body id="bodyquerywindow" <?php echo $onload; ?> bgcolor="<?php echo ($cfg['QueryFrameJS'] ? $cfg['LeftBgColor'] : $cfg['RightBgColor']); ?>">
 <div id="querywindowcontainer">
 <?php
 if ( $cfg['QueryFrameJS'] && !isset($no_js) ) {
diff --git a/server_databases.php b/server_databases.php
index e2d402048..9603543fb 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -15,20 +15,6 @@ require_once('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
 require('./server_common.inc.php');
 
-?>
-<script type="text/javascript" language="javascript1.2">
-<!--
-function reload_window(db) {
-    if (typeof(window.parent) != 'undefined'
-        && typeof(window.parent.frames['nav']) != 'undefined') {
-        window.parent.frames['nav'].goTo('./left.php?<?php echo PMA_generate_common_url('','','&');?>&db=' + db + '&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
-    }
-}
-//-->
-</script>
-
-<?php
-
 /**
  * Sorts the databases array according to the user's choice
  *
@@ -248,7 +234,7 @@ if (count($statistics) > 0) {
             echo '            </td>' . "\n";
         }
         echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-           . '                <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="' . $cfg['DefaultTabDatabase'] . '?' . $url_query . '&amp;db=' . urlencode($current['db_name']) . '" title="' . sprintf($strJumpToDB, htmlspecialchars($current['db_name'])) . '">' . "\n"
+           . '                <a onclick="if ( window.parent.frames[0].openDb(\'' . urlencode($current['db_name']) . '\') ) return false;" href="index.php?' . $url_query . '&amp;db=' . urlencode($current['db_name']) . '" title="' . sprintf($strJumpToDB, htmlspecialchars($current['db_name'])) . '" target="_parent">' . "\n"
            . '                    ' . htmlspecialchars($current['db_name']) . "\n"
            . '                </a>' . "\n"
            . '            </td>' . "\n";
@@ -289,7 +275,7 @@ if (count($statistics) > 0) {
         }
         if ($is_superuser) {
             echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '" align="center">' . "\n"
-               . '                <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
+               . '                <a onclick="window.parent.frames[0].openDb(\'' . urlencode($current['db_name']) . '\', true);" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
                . '                    ' .($cfg['PropertiesIconic'] ? '<img src="' . $pmaThemeImage . 's_rights.png" width="16" height="16" hspace="2" border="0" alt=" ' .$strCheckPrivs . '" /> ' : $strCheckPrivs ). "\n"
                . '                </a>' . "\n"
                . '            </td>' . "\n";
diff --git a/themes/darkblue_orange/css/theme_left.css.php b/themes/darkblue_orange/css/theme_left.css.php
index 41f048cb0..9e45d3568 100644
--- a/themes/darkblue_orange/css/theme_left.css.php
+++ b/themes/darkblue_orange/css/theme_left.css.php
@@ -1,241 +1,91 @@
-/************************************************************************************
- * LEFT FRAME
- ************************************************************************************/
-
-    /**
-     * Add styles for positioned layers
-    **/
-/*
-<?php
-    if (isset($num_dbs) && $num_dbs == '0') {
-?>
-*/
-/* No layer effects neccessary */
-div{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.heada{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.parent{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.item, .tblItem, .item:active, .item:hover, .tblItem, .tblItem:active{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.tblItem:hover{
-    color:            #ffffcc;
-    text-decoration:  underline;
-}
-/*
-<?php
-    } else {
-        if (isset($js_capable) && $js_capable != '0') {
-            // Brian Birtles : This is not the ideal method of doing this
-            // but under the 7th June '00 Mozilla build (and many before
-            // it) Mozilla did not treat text between <style> tags as
-            // style information unless it was written with the one call
-            // to write().
-            if (isset($js_isDOM) && $js_isDOM != '0') {
-?>
-*/
-/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
-div{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.heada{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.headaCnt{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.parent{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    color:            #ffffff;
-    text-decoration:  none;
-    display:          block;
-}
-.child{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-    display:          none;
-}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active{
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.tblItem:hover{
-    color:            #ffffcc;
-    text-decoration:  underline;
-}
-/*
-<?php
-            } else {
-?>
-*/
-/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
-div{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #000000;
-}
-.heada{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.headaCnt{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-/*
-<?php
-            if (isset($js_isIE4) && $js_isIE4 != '0') {
-?>
-*/
-/* Additional effects for IE4 */
-.parent{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    color:            #ffffff;
-    text-decoration:  none;
-    display:          block;
-}
-.child{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-    display:          none;
-}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active{
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.tblItem:hover{
-    color:            #ffffcc;
-    text-decoration:  underline;
-}
-/*
-
-<?php
-                } else {
-?>
-*/
-/* Additional effects for NON-IE4 */
-.parent{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    color:            #ffffff;
-    text-decoration:  none;
-    position:         absolute;   /* don't edit! */
-    visibility:       hidden;     /* don't edit! */
-}
-.child{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    position:         absolute;   /* don't edit! */
-    visibility:       hidden;     /* don't edit! */
-}
-.item, .tblItem{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-/*
-<?php
-                }
-            }
-        } else {
-?>
-*/
-/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
-div{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.heada{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.headaCnt{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-}
-.parent{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.child{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active{
-    font-size:        10px;
-    color:            #ffffff;
-    text-decoration:  none;
-}
-.tblItem:hover{
-    color:            #ffffcc;
-    text-decoration:  underline;
-}
-/*
-<?php
-        }
-    }
-?>
-*/
-/* Always enabled stylesheets (left frame) */
-body{
+body {
     font-family:      Verdana, Arial, Helvetica, sans-serif;
     font-size:        10px;
     background-color: #666699;
-    margin: 0px;
+    margin: 0;
     padding: 2px 2px 2px 2px;
 }
-input{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
+
+body#body_leftFrame {
+    background-color: <?php echo $cfg['LeftBgColor']; ?>;
 }
+
+div {
+    color:            #ffffff;
+}
+
 select{
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        10px;
     background-color: #ffffff;
     color:            #000000;
     width:            150px;
 }
-hr{
-    color:            #ffffff;
-    background-color: #ffffff;
-    border:           0;
-    height:           1px;
-}
+
 img, input, select, button {
     vertical-align: middle;
 }
+
+div#pmalogo,
+div#leftframelinks,
+div#databaseList {
+    text-align: center;
+    border-bottom: 0.1em solid #ffffff;
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div#leftframelinks a {
+    margin: 0.1em;
+}
+
+div#leftframelinks a:hover {
+    background-color: #ffffff;
+}
+
+div#databaseList form {
+    display: inline;
+}
+
+/* leftdatabaselist */
+div#left_tableList {
+    list-style-type: none;
+    list-style-position: outside;
+    margin: 0;
+    padding: 0;
+    font-size: 10px;
+}
+
+div#left_tableList a {
+    color: #ffffff;
+    text-decoration: none;
+}
+
+div#left_tableList a:hover {
+    color: #ffffff;
+    text-decoration: underline;
+}
+
+div#left_tableList li {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+
+<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
+div#left_tableList li:hover {
+    background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+}
+<?php } ?>
+
+div#left_tableList img {
+    height: 1em;
+    width: auto;
+    vertical-align: middle;
+}
+
+div#left_tableList ul ul {
+    margin-left: 0em;
+    padding-left: 0.1em;
+    border-left: 0.1em solid #ffffff;
+    padding-bottom: 0.1em;
+    border-bottom: 0.1em solid #ffffff;
+}
\ No newline at end of file
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 55d4ca581..de27403ad 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -1,74 +1,92 @@
-<?php
-    if (isset($num_dbs) && $num_dbs == '0') {
-    ?>
-/* No layer effects neccessary */
-div     {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-    <?php
-    } else {
-        if (isset($js_capable) && $js_capable != '0') {
-            // Brian Birtles : This is not the ideal method of doing this
-            // but under the 7th June '00 Mozilla build (and many before
-            // it) Mozilla did not treat text between <style> tags as
-            // style information unless it was written with the one call
-            // to write().
-            if (isset($js_isDOM) && $js_isDOM != '0') {
-            ?>
-/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-            <?php
-            } else {
-            ?>
-/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-            <?php
-                if (isset($js_isIE4) && $js_isIE4 != '0') {
-            ?>
-/* Additional effects for IE4 */
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-            <?php
-                } else {
-            ?>
-/* Additional effects for NON-IE4 */
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; position: absolute; visibility: hidden}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; position: absolute; visibility: hidden}
-.item, .tblItem {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-            <?php
-                }
-            }
-        } else {
-        ?>
-/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-        <?php
-        }
-    }
-    ?>
-/* Always enabled stylesheets (left frame) */
-body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; }
-input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
+body, input, select {
+    font-family: <?php echo $left_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    color: #000000
+}
 
-img, input, select, button {
+body#body_leftFrame {
+    background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+}
+
+select {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+div#pmalogo,
+div#leftframelinks,
+div#databaseList {
+    text-align: center;
+    border-bottom: 0.05em solid #669999;
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div#pmalogo img#imgpmalogo {
+    width: 100%;
+    max-width: 11em;
+    height: auto;
+}
+
+div#leftframelinks img {
     vertical-align: middle;
 }
+
+div#leftframelinks a {
+    margin: 0.1em;
+    padding: 0.2em;
+    border: 0.05em solid #669999;
+}
+
+div#leftframelinks a:hover {
+    background-color: #669999;
+}
+
+div#databaseList form {
+    display: inline;
+}
+
+/* leftdatabaselist */
+div#left_tableList {
+    list-style-type: none;
+    list-style-position: outside;
+    margin: 0;
+    padding: 0;
+    font-size: <?php echo $font_smaller; ?>;
+}
+
+div#left_tableList a {
+    color: #333399;
+    text-decoration: none;
+}
+
+div#left_tableList a:hover {
+    color: #FF0000;
+    text-decoration: underline;
+}
+
+div#left_tableList li {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+
+<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
+div#left_tableList li:hover {
+    background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+}
+<?php } ?>
+
+div#left_tableList img {
+    height: 1em;
+    width: auto;
+    vertical-align: middle;
+}
+
+div#left_tableList ul ul {
+    margin-left: 0em;
+    padding-left: 0.1em;
+    border-left: 0.1em solid #669999;
+    padding-bottom: 0.1em;
+    border-bottom: 0.1em solid #669999;
+}
\ No newline at end of file