diff --git a/create.inc.php b/create.inc.php
index 4d236fa1..02743f5b 100644
--- a/create.inc.php
+++ b/create.inc.php
@@ -96,7 +96,10 @@ $collations = collations();
 <select name="Collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $row["Collation"]); ?></select>
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 </p>
+<table border="0" cellspacing="0" cellpadding="2">
 <?php $column_comments = edit_fields($row["fields"], $collations); ?>
+</table>
+<?php echo type_change(count($row["fields"])); ?>
 <p><?php echo lang('Comment'); ?>: <input name="Comment" value="<?php echo htmlspecialchars($row["Comment"]); ?>" maxlength="60" />
 <script type="text/javascript">
 document.write('<label for="column_comments"><input type="checkbox" id="column_comments"<?php if ($column_comments) { ?> checked="checked"<?php } ?> onclick="column_comments_click(this.checked);" /><?php echo lang('Show column comments'); ?></label>');
diff --git a/editing.inc.php b/editing.inc.php
index fe8b51c6..a733baab 100644
--- a/editing.inc.php
+++ b/editing.inc.php
@@ -80,7 +80,6 @@ function process_type($field) {
 function edit_fields($fields, $collations, $type = "TABLE") {
 	global $inout;
 ?>
-<table border="0" cellspacing="0" cellpadding="2">
 <thead><tr>
 <?php if ($type == "PROCEDURE") { ?><td><?php echo lang('In-Out'); ?></td><?php } ?>
 <th><?php echo lang('Column name'); ?></th>
@@ -95,10 +94,10 @@ function edit_fields($fields, $collations, $type = "TABLE") {
 <td><input type="submit" name="add[0]" value="<?php echo lang('Add next'); ?>" /></td>
 </tr></thead>
 <?php
-$column_comments = false;
-foreach ($fields as $i => $field) {
-	$i++;
-	?>
+	$column_comments = false;
+	foreach ($fields as $i => $field) {
+		$i++;
+		?>
 <tr>
 <?php if ($type == "PROCEDURE") { ?><td><select name="inout"><?php echo optionlist($inout, $field["inout"]); ?></select></td><?php } ?>
 <th><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo htmlspecialchars($field[($_POST ? "orig" : "field")]); ?>" /><input name="fields[<?php echo $i; ?>][field]" value="<?php echo htmlspecialchars($field["field"]); ?>" maxlength="64" /></th>
@@ -111,25 +110,27 @@ foreach ($fields as $i => $field) {
 <td><input type="submit" name="add[<?php echo $i; ?>]" value="<?php echo lang('Add next'); ?>" /></td>
 </tr>
 <?php
-	if (strlen($field["comment"])) {
-		$column_comments = true;
+		if (strlen($field["comment"])) {
+			$column_comments = true;
+		}
 	}
+	//! JavaScript for next rows
+	return $column_comments;
 }
-//! JavaScript for next rows
+
+function type_change($count) {
 ?>
-</table>
 <script type="text/javascript">
 function type_change(type) {
 	var name = type.name.substr(0, type.name.length - 6);
 	type.form[name + '[collation]'].style.display = (/char|text|enum|set/.test(type.form[name + '[type]'].value) ? '' : 'none');
 	type.form[name + '[unsigned]'].style.display = (/int|float|double|decimal/.test(type.form[name + '[type]'].value) ? '' : 'none');
 }
-for (var i=1; <?php echo count($fields); ?> >= i; i++) {
+for (var i=1; <?php echo $count; ?> >= i; i++) {
 	document.getElementById('form')['fields[' + i + '][type]'].onchange();
 }
 </script>
 <?php
-	return $column_comments;
 }
 
 function routine($name, $type) {