diff --git a/ChangeLog b/ChangeLog
index 25c1ec9f2..b5b3f31ce 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ $Source$
 2002-04-29 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_qbe.php3: corrections from Mike Beck for better joints
       when more than one table is the master in a relation
+    * tbl_properties_links.php3, tbl_properties_operations.php3,
+      new tbl_properties_options.php3, lang/*: new Options page
+      (will grow when Feature request 441716 is done)
 
 2002-04-28 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties.php3, new tbl_properties_common.php3:
diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3
index 158c68512..eb8a7a4b1 100644
--- a/lang/arabic.inc.php3
+++ b/lang/arabic.inc.php3
@@ -358,4 +358,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3
index b89ad9d51..ec4930db3 100644
--- a/lang/brazilian_portuguese.inc.php3
+++ b/lang/brazilian_portuguese.inc.php3
@@ -356,4 +356,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/bulgarian-koi8.inc.php3 b/lang/bulgarian-koi8.inc.php3
index 4d6aaae89..9e481045d 100644
--- a/lang/bulgarian-koi8.inc.php3
+++ b/lang/bulgarian-koi8.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3
index b6358ce03..86bd6cb1b 100644
--- a/lang/bulgarian-win1251.inc.php3
+++ b/lang/bulgarian-win1251.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3
index a6dff3383..fcccd3244 100644
--- a/lang/catala.inc.php3
+++ b/lang/catala.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index ed8255d91..6c7604468 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -354,4 +354,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index fa07add8c..1b4c38804 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -350,4 +350,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/croatian-iso8859-2.inc.php3 b/lang/croatian-iso8859-2.inc.php3
index a3226dee0..d9fa33888 100644
--- a/lang/croatian-iso8859-2.inc.php3
+++ b/lang/croatian-iso8859-2.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/croatian-win1250.inc.php3 b/lang/croatian-win1250.inc.php3
index 2ba3d5e37..3951019b1 100644
--- a/lang/croatian-win1250.inc.php3
+++ b/lang/croatian-win1250.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3
index 0cd55da14..08d216e5b 100644
--- a/lang/czech-iso.inc.php3
+++ b/lang/czech-iso.inc.php3
@@ -353,4 +353,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3
index 812337391..d4d8eab56 100644
--- a/lang/czech-win1250.inc.php3
+++ b/lang/czech-win1250.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3
index fedf352fe..f058e2e75 100644
--- a/lang/danish.inc.php3
+++ b/lang/danish.inc.php3
@@ -351,4 +351,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3
index 6fb0316d8..65176788f 100644
--- a/lang/dutch.inc.php3
+++ b/lang/dutch.inc.php3
@@ -349,4 +349,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/english.inc.php3 b/lang/english.inc.php3
index 330a0f7a9..c0a385fc2 100644
--- a/lang/english.inc.php3
+++ b/lang/english.inc.php3
@@ -219,6 +219,7 @@ $strOperations = 'Operations';
 $strOptimizeTable = 'Optimize table';
 $strOptionalControls = 'Optional. Controls how to write or read special characters.';
 $strOptionally = 'OPTIONALLY';
+$strOptions = 'Options';
 $strOr = 'Or';
 $strOverhead = 'Overhead';
 
diff --git a/lang/estonian.inc.php3 b/lang/estonian.inc.php3
index d1fa203a9..5e88716b9 100644
--- a/lang/estonian.inc.php3
+++ b/lang/estonian.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3
index dc6e817fb..89ad8dcb5 100644
--- a/lang/finnish.inc.php3
+++ b/lang/finnish.inc.php3
@@ -356,4 +356,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/french.inc.php3 b/lang/french.inc.php3
index 5109118bb..de70b134b 100644
--- a/lang/french.inc.php3
+++ b/lang/french.inc.php3
@@ -219,6 +219,7 @@ $strOperations = 'Op
 $strOptimizeTable = 'Optimiser la table';
 $strOptionalControls = 'Optionnel. Indique le caractère qui permet d\'enlever l\'effet des caractères spéciaux.';
 $strOptionally = 'OPTIONNEL';
+$strOptions = 'Options';
 $strOr = 'Ou';
 $strOverhead = 'Perte';
 
diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3
index ce179ce9e..3bb94da58 100644
--- a/lang/galician.inc.php3
+++ b/lang/galician.inc.php3
@@ -356,4 +356,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/georgian.inc.php3 b/lang/georgian.inc.php3
index 9f536ae70..5bc65cdc7 100644
--- a/lang/georgian.inc.php3
+++ b/lang/georgian.inc.php3
@@ -361,4 +361,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/german.inc.php3 b/lang/german.inc.php3
index 05375a1d2..3e9b0834a 100644
--- a/lang/german.inc.php3
+++ b/lang/german.inc.php3
@@ -352,4 +352,5 @@ $strYes = 'Ja';
 $strZip = '"Zip komprimiert"';
 
 // To translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3
index 7bcec55eb..9b4ee5567 100644
--- a/lang/greek.inc.php3
+++ b/lang/greek.inc.php3
@@ -353,4 +353,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/hebrew.inc.php3 b/lang/hebrew.inc.php3
index 0f898a9cc..2ccbf2a7c 100644
--- a/lang/hebrew.inc.php3
+++ b/lang/hebrew.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/hungarian.inc.php3 b/lang/hungarian.inc.php3
index 3f704fc9c..61729546f 100644
--- a/lang/hungarian.inc.php3
+++ b/lang/hungarian.inc.php3
@@ -354,4 +354,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/indonesian.inc.php3 b/lang/indonesian.inc.php3
index 432372902..e72e66569 100644
--- a/lang/indonesian.inc.php3
+++ b/lang/indonesian.inc.php3
@@ -351,4 +351,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3
index 0c7465b37..fc7854b99 100644
--- a/lang/italian.inc.php3
+++ b/lang/italian.inc.php3
@@ -359,4 +359,5 @@ $strZip = '"compresso con zip"';
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
-?>
\ No newline at end of file
+$strOptions = 'Options';  //to translate
+?>
diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3
index b9957fecd..d5c53fc92 100644
--- a/lang/japanese-euc.inc.php3
+++ b/lang/japanese-euc.inc.php3
@@ -361,4 +361,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3
index 07bcbe15a..82b1a3c30 100644
--- a/lang/japanese-sjis.inc.php3
+++ b/lang/japanese-sjis.inc.php3
@@ -361,4 +361,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3
index 05cb69751..4ea88959c 100644
--- a/lang/korean.inc.php3
+++ b/lang/korean.inc.php3
@@ -353,4 +353,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/latvian.inc.php3 b/lang/latvian.inc.php3
index 6921a8311..6fb8167de 100644
--- a/lang/latvian.inc.php3
+++ b/lang/latvian.inc.php3
@@ -356,4 +356,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/lithuanian.inc.php3 b/lang/lithuanian.inc.php3
index 73fab6e0c..ba964cc01 100644
--- a/lang/lithuanian.inc.php3
+++ b/lang/lithuanian.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3
index d20805673..1898e54ca 100644
--- a/lang/norwegian.inc.php3
+++ b/lang/norwegian.inc.php3
@@ -356,4 +356,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3
index 527b1df26..7a036e38f 100644
--- a/lang/polish.inc.php3
+++ b/lang/polish.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3
index afcefb5b2..9194e05be 100644
--- a/lang/portuguese.inc.php3
+++ b/lang/portuguese.inc.php3
@@ -359,4 +359,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3
index a6f743159..8f9708105 100644
--- a/lang/romanian.inc.php3
+++ b/lang/romanian.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3
index 7f77f6823..5fd38238d 100644
--- a/lang/russian-koi8.inc.php3
+++ b/lang/russian-koi8.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3
index eed2d7a65..2bd46b30c 100644
--- a/lang/russian-win1251.inc.php3
+++ b/lang/russian-win1251.inc.php3
@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/serbian-win1250.inc.php3 b/lang/serbian-win1250.inc.php3
index 7130557f2..31796d4c7 100644
--- a/lang/serbian-win1250.inc.php3
+++ b/lang/serbian-win1250.inc.php3
@@ -358,4 +358,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3
index 54d7999f3..6ce456da4 100644
--- a/lang/slovak-iso.inc.php3
+++ b/lang/slovak-iso.inc.php3
@@ -355,4 +355,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/slovak-win1250.inc.php3 b/lang/slovak-win1250.inc.php3
index 40f71f425..8ce591c9d 100644
--- a/lang/slovak-win1250.inc.php3
+++ b/lang/slovak-win1250.inc.php3
@@ -355,4 +355,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3
index 683696f3a..0eeb302ed 100644
--- a/lang/spanish.inc.php3
+++ b/lang/spanish.inc.php3
@@ -350,4 +350,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3
index 4297c8204..a264f2015 100644
--- a/lang/swedish.inc.php3
+++ b/lang/swedish.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3
index aded739c3..8e4df70ce 100644
--- a/lang/thai.inc.php3
+++ b/lang/thai.inc.php3
@@ -358,4 +358,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/turkish.inc.php3 b/lang/turkish.inc.php3
index 3e370cd7e..0ca9ff690 100644
--- a/lang/turkish.inc.php3
+++ b/lang/turkish.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/lang/ukrainian-win1251.inc.php3 b/lang/ukrainian-win1251.inc.php3
index 3089652b3..fa5471be2 100644
--- a/lang/ukrainian-win1251.inc.php3
+++ b/lang/ukrainian-win1251.inc.php3
@@ -352,4 +352,5 @@ $strLinksTo = 'Links to';  //to translate
 $strExport = 'Export';  //to translate
 $strOperations = 'Operations';  //to translate
 $strExportToXML = 'Export to XML format'; //to translate
+$strOptions = 'Options';  //to translate
 ?>
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index 1597be2a9..7fa5fe031 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -7,6 +7,7 @@
  */
 $lnk3        = '<a href="tbl_properties_export.php3?' . $url_query . '">';
 $lnk5        = '<a href="tbl_properties_operations.php3?' . $url_query . '">';
+$lnk6        = '<a href="tbl_properties_options.php3?' . $url_query . '">';
 
 if ($num_rows > 0) {
     $lnk1    = '<a href="sql.php3?' . $url_query
@@ -45,7 +46,9 @@ if ($num_rows > 0) {
     [ <?php echo $lnk3 . "\n"; ?>
          <b><?php echo $strExport; ?></b><?php if ($lnk3) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;
     [ <?php echo $lnk5 . "\n"; ?>
-         <b><?php echo $strOperations; ?></b><?php if ($lnk5) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+         <b><?php echo $strOperations; ?></b><?php if ($lnk5) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;
+    [ <?php echo $lnk6 . "\n"; ?>
+         <b><?php echo $strOptions; ?></b><?php if ($lnk6) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&amp;back=tbl_properties.php3&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
          <b><?php echo $strDrop; ?></b></a> ]
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php3
index 2000f02c3..d74602d64 100755
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php3
@@ -272,83 +272,6 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
     echo "\n";
 } // end 3.23.06 < MySQL < 3.23.22
 
-if (PMA_MYSQL_INT_VERSION >= 32322) {
-?>
-    <!-- Table comments -->
-    <li>
-        <form method="post" action="tbl_properties.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; ?>" />
-            <input type="hidden" name="table" value="<?php echo $table; ?>" />
-            <?php echo $strTableComments; ?>&nbsp;:&nbsp;
-            <input type="hidden" name="prev_comment" value="<?php echo urlencode($show_comment); ?>" />&nbsp;
-            <input type="text" name="comment" maxlength="60" size="30" value="<?php echo str_replace('"', '&quot;', $show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
-            <input type="submit" name="submitcomment" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
-        </form>
-    </li>
-
-    <!-- Table type -->
-    <?php
-    // modify robbat2 code - staybyte - 11. June 2001
-    $query  = 'SHOW VARIABLES LIKE \'have_%\'';
-    $result = mysql_query($query);
-    if ($result != FALSE && mysql_num_rows($result) > 0) {
-        while ($tmp = mysql_fetch_array($result)) {
-            if (isset($tmp['Variable_name'])) {
-                switch ($tmp['Variable_name']) {
-                    case 'have_bdb':
-                        if ($tmp['Value'] == 'YES') {
-                            $tbl_bdb    = TRUE;
-                        }
-                        break;
-                    case 'have_gemini':
-                        if ($tmp['Value'] == 'YES') {
-                            $tbl_gemini = TRUE;
-                        }
-                        break;
-                    case 'have_innodb':
-                        if ($tmp['Value'] == 'YES') {
-                            $tbl_innodb = TRUE;
-                        }
-                        break;
-                    case 'have_isam':
-                        if ($tmp['Value'] == 'YES') {
-                            $tbl_isam   = TRUE;
-                        }
-                        break;
-                } // end switch
-            } // end if isset($tmp['Variable_name'])
-        } // end while
-    } // end if $result
-
-    mysql_free_result($result);
-    echo "\n";
-    ?>
-    <li>
-        <form method="post" action="tbl_properties.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; ?>" />
-            <input type="hidden" name="table" value="<?php echo $table; ?>" />
-            <?php echo $strTableType; ?>&nbsp;:&nbsp;
-            <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 } ?>
-                <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;
-            <?php echo PMA_showDocuShort('T/a/Table_types.html') . "\n"; ?>
-        </form>
-    </li>
-    <?php
-    echo "\n";
-} // end MySQL >= 3.23.22
-
 // Referential integrity check
 if (!empty($cfg['Server']['relation'])) {
 
diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3
new file mode 100755
index 000000000..1d3390e91
--- /dev/null
+++ b/tbl_properties_options.php3
@@ -0,0 +1,91 @@
+<?php
+/* $Id$ */
+
+
+require('./tbl_properties_common.php3');
+require('./tbl_properties_table_info.php3');
+
+if (PMA_MYSQL_INT_VERSION >= 32322) {
+?>
+<ul>
+    <!-- Table comments -->
+    <li>
+        <form method="post" action="tbl_properties.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; ?>" />
+            <input type="hidden" name="table" value="<?php echo $table; ?>" />
+            <?php echo $strTableComments; ?>&nbsp;:&nbsp;
+            <input type="hidden" name="prev_comment" value="<?php echo urlencode($show_comment); ?>" />&nbsp;
+            <input type="text" name="comment" maxlength="60" size="30" value="<?php echo str_replace('"', '&quot;', $show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
+            <input type="submit" name="submitcomment" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
+        </form>
+    </li>
+
+    <!-- Table type -->
+    <?php
+    // modify robbat2 code - staybyte - 11. June 2001
+    $query  = 'SHOW VARIABLES LIKE \'have_%\'';
+    $result = mysql_query($query);
+    if ($result != FALSE && mysql_num_rows($result) > 0) {
+        while ($tmp = mysql_fetch_array($result)) {
+            if (isset($tmp['Variable_name'])) {
+                switch ($tmp['Variable_name']) {
+                    case 'have_bdb':
+                        if ($tmp['Value'] == 'YES') {
+                            $tbl_bdb    = TRUE;
+                        }
+                        break;
+                    case 'have_gemini':
+                        if ($tmp['Value'] == 'YES') {
+                            $tbl_gemini = TRUE;
+                        }
+                        break;
+                    case 'have_innodb':
+                        if ($tmp['Value'] == 'YES') {
+                            $tbl_innodb = TRUE;
+                        }
+                        break;
+                    case 'have_isam':
+                        if ($tmp['Value'] == 'YES') {
+                            $tbl_isam   = TRUE;
+                        }
+                        break;
+                } // end switch
+            } // end if isset($tmp['Variable_name'])
+        } // end while
+    } // end if $result
+
+    mysql_free_result($result);
+    echo "\n";
+    ?>
+    <li>
+        <form method="post" action="tbl_properties.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; ?>" />
+            <input type="hidden" name="table" value="<?php echo $table; ?>" />
+            <?php echo $strTableType; ?>&nbsp;:&nbsp;
+            <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 } ?>
+                <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;
+            <?php echo PMA_showDocuShort('T/a/Table_types.html') . "\n"; ?>
+        </form>
+    </li>
+    <?php
+    echo "\n";
+} // end MySQL >= 3.23.22
+
+/**
+ * Displays the footer
+ */
+echo "\n";
+require('./footer.inc.php3');
+?>