diff --git a/ChangeLog b/ChangeLog
index f98e349ad..0d0c6c6d4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-02 Marc Delisle  <lem9@users.sourceforge.net>
+    * main.php: put Create button on the same line as the input field
+
 2004-07-01 Michal Čihař  <michal@cihar.com>
     * lang/czech: Updated.
 
diff --git a/main.php b/main.php
index d68f479bb..5d712b7de 100644
--- a/main.php
+++ b/main.php
@@ -290,7 +290,7 @@ if ($server > 0) {
                     <?php echo $strCreateNewDatabase . '&nbsp;' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br />
                     <?php echo PMA_generate_common_hidden_inputs(5); ?>
                     <input type="hidden" name="reload" value="1" />
-                    <input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="listTable" /><br />
+                    <input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" id="listTable" />
                     <?php
             if (PMA_MYSQL_INT_VERSION >= 40101) {
                 require_once('./libraries/mysql_charsets.lib.php');
@@ -338,9 +338,7 @@ if ($server > 0) {
             echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'<a href="./server_variables.php?'.$common_url_query.'">','s_vars.png',$strMySQLShowVars,'</a>') : $str_normal_list);
 ?>
         <td>
-                <a href="./server_variables.php?<?php echo $common_url_query; ?>">
-                <?php echo $strMySQLShowVars;?></a>&nbsp;
-                <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'SHOW_VARIABLES') . "\n"; ?>
+                <a href="./server_variables.php?<?php echo $common_url_query; ?>"><?php echo $strMySQLShowVars;?></a>&nbsp;<?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'SHOW_VARIABLES') . "\n"; ?>
         </td>
     </tr>
         <?php