diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index f81eb8854..9a1999a38 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -648,14 +648,23 @@ li#li_flush_privileges {
 }
 
 #selflink {
-    float: right;
     clear: both;
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    width: 100%;
+    border-top: 0.1em solid silver;
+    text-align: <?php echo $right; ?>;
 }
 
 #table_innodb_bufferpool_usage,
 #table_innodb_bufferpool_activity {
     float: <?php echo $left; ?>;
 }
+
+#div_mysql_charset_collations table {
+    float: <?php echo $left; ?>;
+}
     <?php
 } // end styles 2.7.1
 
diff --git a/server_collations.php b/server_collations.php
index 19b846708..5cc0cfef1 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -2,6 +2,9 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
+/**
+ * requirements
+ */
 require_once('./libraries/common.lib.php');
 
 /**
@@ -20,7 +23,9 @@ require('./libraries/server_links.inc.php');
  * Displays the sub-page heading
  */
 echo '<h2>' . "\n"
-   . '    ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />' : '')
+   . '    ' . ($GLOBALS['cfg']['MainPageIconic']
+    ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />'
+    : '')
    . '' . $strCharsetsAndCollations . "\n"
    . '</h2>' . "\n";
 
@@ -43,18 +48,11 @@ require_once('./libraries/mysql_charsets.lib.php');
 /**
  * Outputs the result
  */
-echo '<table border="0">' . "\n"
-   . '    <tr>' . "\n"
-   . '        <td valign="top">' . "\n"
-   . '            <table border="0" cellpadding="2" cellspacing="1">' . "\n"
-   . '                <tr>' . "\n"
-   . '                <th>' . "\n"
-   . '                    ' . $strCollation . "\n"
-   . '                </th>' . "\n"
-   . '                <th>' . "\n"
-   . '                    ' . $strDescription . "\n"
-   . '                </th>' . "\n"
-   . '            </tr>' . "\n";
+echo '<div id="div_mysql_charset_collations">' . "\n"
+   . '<table class="data">' . "\n"
+   . '<tr><th>' . $strCollation . '</th>' . "\n"
+   . '    <th>' . $strDescription . '</th>' . "\n"
+   . '</tr>' . "\n";
 
 $i = 0;
 $table_row_count = count($mysql_charsets) + $mysql_collations_count;
@@ -62,45 +60,40 @@ $table_row_count = count($mysql_charsets) + $mysql_collations_count;
 foreach ($mysql_charsets as $current_charset) {
     if ($i >= $table_row_count / 2) {
         $i = 0;
-        echo '            </table>' . "\n"
-           . '        </td>' . "\n"
-           . '        <td valign="top">' . "\n"
-           . '            <table border="0" cellpadding="2" cellspacing="1">' . "\n"
-           . '                <tr>' . "\n"
-           . '                <th>' . "\n"
-           . '                    ' . $strCollation . "\n"
-           . '                </th>' . "\n"
-           . '                <th>' . "\n"
-           . '                    ' . $strDescription . "\n"
-           . '                </th>' . "\n"
-           . '            </tr>' . "\n";
+        echo '</table>' . "\n"
+           . '<table class="data">' . "\n"
+           . '<tr><th>' . $strCollation . '</th>' . "\n"
+           . '    <th>' . $strDescription . '</th>' . "\n"
+           . '</tr>' . "\n";
     }
     $i++;
-    echo '            <tr>' . "\n"
-       . '                <th colspan="2" align="right">' . "\n"
-       . '                    &nbsp;<b>' . htmlspecialchars($current_charset) . '</b>' . "\n"
-       . (empty($mysql_charsets_descriptions[$current_charset]) ? '' : '                    (<i>' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . '</i>)&nbsp;' . "\n")
-       . '                </th>' . "\n"
-       . '            </tr>' . "\n";
-    $useBgcolorOne = TRUE;
+    echo '<tr><th colspan="2" align="right">' . "\n"
+       . '        ' . htmlspecialchars($current_charset) . "\n"
+       . (empty($mysql_charsets_descriptions[$current_charset])
+            ? ''
+            : '        (<i>' . htmlspecialchars(
+                $mysql_charsets_descriptions[$current_charset]) . '</i>)' . "\n")
+       . '    </th>' . "\n"
+       . '</tr>' . "\n";
+    $odd_row = true;
     foreach ($mysql_collations[$current_charset] as $current_collation) {
         $i++;
-        echo '            <tr' . ($mysql_collations_available[$current_collation] ? '' : ' class="disabled"') . '>' . "\n"
-           . '                <td bgcolor="' . ($mysql_default_collations[$current_charset] == $current_collation ? $cfg['BrowseMarkerColor'] : ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'])) . '">' . "\n"
-           . '                    &nbsp;' . htmlspecialchars($current_collation) . '&nbsp;' . "\n"
-           . '                </td>' . "\n"
-           . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-           . '                    &nbsp;' . PMA_getCollationDescr($current_collation) . '&nbsp;' . "\n"
-           . '                </td>' . "\n"
-           . '            </tr>' . "\n";
-        $useBgcolorOne = !$useBgcolorOne;
+        echo '<tr class="'
+           . ( $odd_row ? 'odd' : 'even' )
+           . ($mysql_default_collations[$current_charset] == $current_collation
+                ? ' marked'
+                : '')
+           . ($mysql_collations_available[$current_collation] ? '' : ' disabled')
+           . '">' . "\n"
+           . '    <td>' . htmlspecialchars($current_collation) . '</td>' . "\n"
+           . '    <td>' . PMA_getCollationDescr($current_collation) . '</td>' . "\n"
+           . '</tr>' . "\n";
+        $odd_row = !$odd_row;
     }
 }
 unset($table_row_count);
-echo '            </table>' . "\n"
-   . '        </td>' . "\n"
-   . '    </tr>' . "\n"
-   . '</table>' . "\n";
+echo '</table>' . "\n"
+   . '</div>' . "\n";
 
 require_once('./libraries/footer.inc.php');