diff --git a/ChangeLog b/ChangeLog
index 94f2d0035..2242310d9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-06-02 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * server_status.php3: RFE #723325 (Move total query statistics).
+
 2003-06-02 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/display_tbl.lib.php3, lang/*: Better text on button for
       executing bookmark (bug #745993).
diff --git a/server_status.php3 b/server_status.php3
index d57d13fdb..c35e6a848 100644
--- a/server_status.php3
+++ b/server_status.php3
@@ -146,8 +146,27 @@ unset($tmp_array);
     <br />
     <li>
         <!-- Queries -->
-        <?php echo sprintf($strQueryStatistics, number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator)); ?><br />
+        <?php echo sprintf($strQueryStatistics, number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator)) . "\n"; ?>
         <table border="0">
+            <tr>
+                <td colspan="2">
+                    <br />
+                    <table border="0" align="right">
+                        <tr>
+                            <th>&nbsp;<?php echo $strTotalUC; ?>&nbsp;</th>
+                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerHour; ?>&nbsp;</th>
+                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerMinute; ?>&nbsp;</th>
+                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerSecond; ?>&nbsp;</th>
+                        </tr>
+                        <tr>
+                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
+                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 3600 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
+                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 60 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
+                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
             <tr>
                 <td valign="top">
                     <table border="0">
@@ -191,26 +210,6 @@ unset($useBgcolorOne);
                     </table>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <br />
-                    <table border="0" align="right">
-                        <tr>
-                            <th>&nbsp;<?php echo $strTotalUC; ?>&nbsp;</th>
-                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerHour; ?>&nbsp;</th>
-                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerMinute; ?>&nbsp;</th>
-                            <th>&nbsp;&oslash;&nbsp;<?php echo $strPerSecond; ?>&nbsp;</th>
-                        </tr>
-
-                        <tr>
-                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
-                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 3600 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
-                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] * 60 / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
-                            <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">&nbsp;<?php echo number_format(($serverStatus['Questions'] / $serverStatus['Uptime']), 2, $number_decimal_separator, $number_thousands_separator); ?>&nbsp;</td>
-                        </tr>
-
-                    </table>
-                </td>
         </table>
     </li>
 <?php
@@ -300,4 +299,4 @@ if ($res) {
  */
 require('./footer.inc.php3');
 
-?>
\ No newline at end of file
+?>