diff --git a/ChangeLog b/ChangeLog
index 8f0acf316..b03abf596 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,7 @@ $Source$
 2002-05-01 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties.php3, tbl_properties_links.php3,
       new tbl_properties_structure, lang/*.php3: Structure page
-      (todo: - stay on the sub-pages as long as needed
-             - "Add field" dialog belongs to Structure page)
+      (todo: - stay on the sub-pages as long as needed)
 
 2002-05-01 Loïc Chapeaux  <lolo@phpheaven.net>
     * tbl_properties.php3; tbl_properties_table_info.php3: comments.
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index 73ae4ec6e..b07f00f4c 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -38,13 +38,13 @@ if ($num_rows > 0) {
 ?>
 <p>
     [ <?php echo $lnk8 . "\n"; ?>
-          <b><?php echo $strMain; ?></b><?php if ($lnk8) echo '</a>'; ?>&nbsp;|
+        <b><?php echo $strMain; ?></b><?php if ($lnk8) echo '</a>'; ?>&nbsp;|
     <?php echo $lnk1 . "\n"; ?>
-          <b><?php echo $strBrowse; ?></b><?php if ($lnk1) echo '</a>'; ?>&nbsp;|
+        <b><?php echo $strBrowse; ?></b><?php if ($lnk1) echo '</a>'; ?>&nbsp;|
     <?php echo $lnk7 . "\n"; ?>
-          <b><?php echo $strStructure; ?></b><?php if ($lnk7) echo '</a>'; ?>&nbsp;|
+        <b><?php echo $strStructure; ?></b><?php if ($lnk7) echo '</a>'; ?>&nbsp;|
     <?php echo $lnk2 . "\n"; ?>
-          <b><?php echo $strSelect; ?></b><?php if ($lnk2) echo '</a>'; ?>&nbsp;|
+        <b><?php echo $strSelect; ?></b><?php if ($lnk2) echo '</a>'; ?>&nbsp;|
     <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a>&nbsp;|
     <?php echo $lnk4 . "\n"; ?>
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php3
index e13c29572..617968731 100755
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php3
@@ -14,29 +14,6 @@ for ($i = 0; $row = mysql_fetch_array($result); $i++) {
 mysql_free_result($result);
 ?>
 <ul>
-    <!-- Add some new fields -->
-    <li>
-        <form method="post" action="tbl_addfield.php3"
-            onsubmit="return checkFormElementInRange(this, 'num_fields', 1)">
-            <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; ?>" />
-            <input type="hidden" name="table" value="<?php echo $table; ?>" />
-            <?php echo $strAddNewField; ?>&nbsp;:
-            <input type="text" name="num_fields" size="2" maxlength="2" value="1" class="textfield" style="vertical-align: middle" onfocus="this.select()" />
-            <select name="after_field" style="vertical-align: middle">
-                <option value="--end--"><?php echo $strAtEndOfTable; ?></option>
-                <option value="--first--"><?php echo $strAtBeginningOfTable; ?></option>
-<?php
-reset($columns);
-while (list($junk, $fieldname) = each($columns)) {
-    echo '                <option value="' . urlencode($fieldname) . '">' . sprintf($strAfter, htmlspecialchars($fieldname)) . '</option>' . "\n";
-}
-?>
-            </select>
-            <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
-        </form>
-    </li>
 
 <?php
 if (PMA_MYSQL_INT_VERSION >= 32334) {
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index 5bb5bfdb7..32fbb521a 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -70,10 +70,12 @@ $fields_cnt  = mysql_num_rows($fields_rs);
 
 <?php
 $i         = 0;
+$aryFields = array();
 
 while ($row = mysql_fetch_array($fields_rs)) {
     $i++;
     $bgcolor          = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
+    $aryFields[]      = $row['Field'];
 
     $type             = $row['Type'];
     // reformat mysql query output - staybyte - 9. June 2001
@@ -492,15 +494,30 @@ echo "\n";
         <div style="margin-bottom: 10px"><a href="tbl_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
     </li>
 
+    <!-- Add some new fields -->
+    <li>
+        <form method="post" action="tbl_addfield.php3"
+            onsubmit="return checkFormElementInRange(this, 'num_fields', 1)">
+            <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; ?>" />
+            <input type="hidden" name="table" value="<?php echo $table; ?>" />
+            <?php echo $strAddNewField; ?>&nbsp;:
+            <input type="text" name="num_fields" size="2" maxlength="2" value="1" class="textfield" style="vertical-align: middle" onfocus="this.select()" />
+            <select name="after_field" style="vertical-align: middle">
+                <option value="--end--"><?php echo $strAtEndOfTable; ?></option>
+                <option value="--first--"><?php echo $strAtBeginningOfTable; ?></option>
 <?php
-
-// Encoding setting form appended by Y.Kawada
-if (function_exists('PMA_set_enc_form')) {
-    echo PMA_set_enc_form('            ');
+reset($aryFields);
+while (list($junk, $fieldname) = each($aryFields)) {
+    echo '                <option value="' . urlencode($fieldname) . '">' . sprintf($strAfter, htmlspecialchars($fieldname)) . '</option>' . "\n";
 }
-
+unset($aryFields);
 ?>
-
+            </select>
+            <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
+        </form>
+    </li>
 </ul>
 
 <?php