diff --git a/ChangeLog b/ChangeLog
index 69023716a..e2649a57a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2002-05-15 Loïc Chapeaux  <lolo@phpheaven.net>
+2002-05-17 Loïc Chapeaux  <lolo@phpheaven.net>
+    * db_details_structure.php3, lines 446-458;
+      tbl_properties_options.php3, lines 119-143: beautified generated code.
+
+2002-05-16 Loïc Chapeaux  <lolo@phpheaven.net>
     * db_details_structure.php3; Documentation.html: coding standards.
 
 2002-05-14 Marc Delisle  <lem9@users.sourceforge.net>
diff --git a/db_details_structure.php3 b/db_details_structure.php3
index 66a40f445..34dd36ae2 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php3
@@ -443,21 +443,19 @@ if (PMA_PHP_INT_VERSION >= 40000
     <!-- PDF schema -->
     <li>
         <form method="post" action="pdf_schema.php3">
-        <input type="hidden" name="server" value="<?php echo $server; ?>" />
-        <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
-        <input type="hidden" name="db" value="<?php echo $db; ?>" />
-    <?php
-    echo '    ' . $strDisplayPDF . '&nbsp;:<br />' . "\n";
-    echo '        ' . $strPageNumber . '&nbsp;' . "\n";
-    echo '        ' . '<input type="text" name="pdf_page_number" size="3" class="textfield" value="1" /><br />' . "\n";
-    echo '        ' . '<input type="checkbox" name="show_grid" />' . "\n";
-    echo '        ' . $strShowGrid . '&nbsp;<br />' . "\n";
-    echo '        ' . '<input type="checkbox" name="show_color" checked="checked" />' . "\n";
-    echo '        ' . $strShowColor . '&nbsp;<br />' . "\n";
-    echo '        ' . '<input type="checkbox" name="show_table_dimension" />' . "\n";
-    echo '        ' . $strShowTableDimension . '&nbsp;' . "\n";
-    echo '        ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
-    ?>
+            <input type="hidden" name="server" value="<?php echo $server; ?>" />
+            <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
+            <input type="hidden" name="db" value="<?php echo $db; ?>" />
+            <?php echo $strDisplayPDF; ?>&nbsp;:<br />
+            <?php echo $strPageNumber; ?>&nbsp;
+            <input type="text" name="pdf_page_number" size="3" class="textfield" value="1" /><br />
+            <input type="checkbox" name="show_grid" id="show_grid_opt" />
+            <label for="show_grid_opt"><?php echo $strShowGrid; ?></label><br />
+            <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" />
+            <label for="show_color_opt"><?php echo $strShowColor; ?></label><br />
+            <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" />
+            <label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label>
+            &nbsp;&nbsp;<input type="submit" value="<?php echo $strGo; ?>" />
         </form>
     </li>
     <?php
diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3
index 583ce577d..36007fd6d 100755
--- a/tbl_properties_options.php3
+++ b/tbl_properties_options.php3
@@ -116,10 +116,31 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
             <select name="tbl_type" style="vertical-align: middle">
                 <option value="MYISAM"<?php if ($tbl_type == 'MYISAM') echo ' selected="selected"'; ?>>MyISAM</option>
                 <option value="HEAP"<?php if ($tbl_type == 'HEAP') echo ' selected="selected"'; ?>>Heap</option>
-                <?php if (isset($tbl_bdb)) { ?><option value="BDB"<?php if ($tbl_type == 'BERKELEYDB') echo ' selected="selected"'; ?>>Berkeley DB</option><?php } ?>
-                <?php if (isset($tbl_gemini)) { ?><option value="GEMINI"<?php if ($tbl_type == 'GEMINI') echo ' selected="selected"'; ?>>Gemini</option><?php } ?>
-                <?php if (isset($tbl_innodb)) { ?><option value="INNODB"<?php if ($tbl_type == 'INNODB') echo ' selected="selected"'; ?>>INNO DB</option><?php } ?>
-                <?php if (isset($tbl_isam)) { ?><option value="ISAM"<?php if ($tbl_type == 'ISAM') echo ' selected="selected"'; ?>>ISAM</option><?php } ?>
+    <?php
+    $tbl_types     = "\n";
+    if (isset($tbl_bdb)) {
+        $tbl_types .= '                <option value="BDB"'
+                   .  (($tbl_type == 'BERKELEYDB') ? ' selected="selected"' : '')
+                   .  '>Berkeley DB</option>' . "\n";
+    }
+    if (isset($tbl_gemini)) {
+        $tbl_types .= '                <option value="GEMINI"'
+                   .  (($tbl_type == 'GEMINI') ? ' selected="selected"' : '')
+                   .  '>Gemini</option>' . "\n";
+    }
+    if (isset($tbl_innodb)) {
+        $tbl_types .= '                <option value="INNODB"'
+                   .  (($tbl_type == 'INNODB') ? ' selected="selected"' : '')
+                   .  '>INNO DB</option>' . "\n";
+    }
+    if (isset($tbl_isam)) {
+        $tbl_types .= '                <option value="ISAM"'
+                   .  (($tbl_type == 'ISAM') ? ' selected="selected"' : '')
+                   .  '>ISAM</option>' . "\n";
+    }
+
+    echo $tbl_types;
+    ?>
                 <option value="MERGE"<?php if ($tbl_type == 'MRG_MYISAM') echo ' selected="selected"'; ?>>Merge</option>
             </select>&nbsp;
             <input type="submit" name="submittype" value="<?php echo $strGo; ?>" style="vertical-align: middle" />&nbsp;