diff --git a/mod/data/add.php b/mod/data/add.php
index 3d025494a34..4090a62fc7f 100755
--- a/mod/data/add.php
+++ b/mod/data/add.php
@@ -214,7 +214,7 @@
     print_simple_box_start('center','80%');
     
     if (!$rid){
-        print_heading(get_string('newentry','data'),2);
+        print_heading(get_string('newentry','data'), '', 2);
     }
     
     /******************************************
diff --git a/mod/data/field/checkbox/field.class.php b/mod/data/field/checkbox/field.class.php
index 47ce05d3f20..3deb3218b2d 100755
--- a/mod/data/field/checkbox/field.class.php
+++ b/mod/data/field/checkbox/field.class.php
@@ -80,8 +80,8 @@ class data_field_checkbox extends data_field_base {
         
         foreach (explode("\n", $field->param1) as $checkbox) {
             $checkbox = ltrim(rtrim($checkbox));
-            $str .= '<input type="checkbox" name="field_' . $field->id . '[]" id="field_';
-            $str .= $field->id . '[]" value="' . $checkbox . '" ';
+            $str .= '<input type="checkbox" name="field_' . $field->id . '[]" ';
+            $str .= 'value="' . $checkbox . '" ';
             
             if (array_search($checkbox, $content) !== false) {
                 // Selected by user.
diff --git a/mod/data/field/checkbox/mod.html b/mod/data/field/checkbox/mod.html
index 7111842a828..0b73e09a783 100755
--- a/mod/data/field/checkbox/mod.html
+++ b/mod/data/field/checkbox/mod.html
@@ -1,11 +1,11 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
@@ -19,13 +19,13 @@
     </tr>
     <tr>
         <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
+        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
     </tr>
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index ddeaab9588d..ab5ebec512f 100755
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -97,7 +97,7 @@ class data_field_file extends data_field_base {// extends
         }
         */
         $str .= '<div title="' . $field->description . '">';
-        $str .= '<input type="hidden" name ="field_'.$field->id.'_0" id="field_'.$field->id.'"_0  value="fakevalue" />';
+        $str .= '<input type="hidden" name ="field_'.$field->id.'_0" value="fakevalue" />';
         $str .= get_string('file','data'). ': <input type="file" name ="field_'.$field->id.'" id="field_'.$field->id.'" title="'.$field->description.'" /><br />';
         $str .= get_string('optionalfilename','data').': <input type="text" name="field_'
                 .$field->id.'_1" id="field_'.$field->id.'_1" value="'.$displayname.'" /><br />';
@@ -108,7 +108,7 @@ class data_field_file extends data_field_base {// extends
         if ($rid and isset($content)){
             require_once($CFG->libdir.'/filelib.php');
             $icon = mimeinfo('icon', $src);
-            $str .= '<img align="absmiddle" src="'.$CFG->pixpath.'/f/'.$icon.'" height="16" width="16" alt="'.$icon.'" />&nbsp;'.
+            $str .= '<img src="'.$CFG->pixpath.'/f/'.$icon.'" height="16" width="16" alt="'.$icon.'" />&nbsp;'.
                     '<a href="'.$source.'/'.$src.'" >'.$name.'</a>';
         }
         return $str;
@@ -143,7 +143,7 @@ class data_field_file extends data_field_base {// extends
             
             require_once($CFG->libdir.'/filelib.php');
             $icon = mimeinfo('icon', $src);
-            $str = '<img align="absmiddle" src="'.$CFG->pixpath.'/f/'.$icon.'" height="16" width="16" alt="'.$icon.'" />&nbsp;'.
+            $str = '<img src="'.$CFG->pixpath.'/f/'.$icon.'" height="16" width="16" alt="'.$icon.'" />&nbsp;'.
                             '<a href="'.$source.'/'.$src.'" >'.$name.'</a>';
             return $str;
         }
diff --git a/mod/data/field/file/mod.html b/mod/data/field/file/mod.html
index 0707ad452d6..e4d38fb7946 100755
--- a/mod/data/field/file/mod.html
+++ b/mod/data/field/file/mod.html
@@ -1,14 +1,33 @@
-<table width="100%"><tr><td span="2">
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
-<?php echo ($this->name()); ?></td></tr>
-<tr><td><Name><?php echo get_string('fieldname', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" /></td></tr>
-<tr><td><?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" /></td></tr>
-<tr><td></td><td><input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-<input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
-<input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
-<input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-<input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
-<input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden"></td>
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
+<table width="100%">
+    <tr>
+        <td colspan="2">
+            <?php echo ($this->name()); ?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldname', 'data'); ?>:
+        </td>
+        <td>
+            <input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
+            <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
+            <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
+        </td>
+        </tr>
+</table>
 </form>
-</td></tr></table>
 
diff --git a/mod/data/field/menu/field.class.php b/mod/data/field/menu/field.class.php
index 1bf4cbcc2fb..2c739a3a763 100755
--- a/mod/data/field/menu/field.class.php
+++ b/mod/data/field/menu/field.class.php
@@ -54,27 +54,25 @@ class data_field_menu extends data_field_base {
             notify("that is not a valid field id!");
             exit;
         }
-
+        $content = '';
+        
         //look for that record and pull it out
         if ($rid) {
             $datacontent = get_record('data_content','fieldid',$id,'recordid',$rid);
             if (isset($datacontent->content)) {
                 $content = $datacontent->content;
-            }else {
-                $content = '';
             }
         }
 
-        $str .= '<table><tr><td>';
+        $str = '<div title="'.$field->description.'"><table><tr><td>';
         /*
         if ($field->description) {
             $str .= '<img src="'.$CFG->pixpath.'/help.gif" alt="'.$field->description.'" title="'.$field->description.'">&nbsp;';
         }
         */
-        $str .= '<div title="'.$field->description.'">';
         $str .= get_string('menu','data').': </td><td>';
         
-        $str .= '<select name="field_'.$field->id.' id="field_'.$field->id.'>';
+        $str .= '<select name="field_'.$field->id.'" id="field_'.$field->id.'">';
         $str .= '<option value="">' . get_string('menuchoose', 'data') . '</option>';
         
         foreach (explode("\n",$field->param1) as $option) {
@@ -84,8 +82,7 @@ class data_field_menu extends data_field_base {
                 $str.='<option value="'.ltrim(rtrim($option)).'">'.ltrim(rtrim($option)).'</option>';
             }
         }
-        $str .= '</div>';
-        $str .= '</select></td></tr></table>';
+        $str .= '</select></td></tr></table></div>';
 
         return $str;
     }
diff --git a/mod/data/field/menu/mod.html b/mod/data/field/menu/mod.html
index 7f0c06729fb..14920b2ba1c 100755
--- a/mod/data/field/menu/mod.html
+++ b/mod/data/field/menu/mod.html
@@ -1,16 +1,16 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
     <tr>
-        <td><Name><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
         <td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" /></td>
     </tr>
     <tr>
@@ -19,13 +19,13 @@
     </tr>
     <tr>
         <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
+        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
     </tr>
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/multimenu/mod.html b/mod/data/field/multimenu/mod.html
index 458cbe860ed..c7d9862dfee 100755
--- a/mod/data/field/multimenu/mod.html
+++ b/mod/data/field/multimenu/mod.html
@@ -1,16 +1,16 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
     <tr>
-        <td><Name><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
         <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($field->name); ?>" /></td>
     </tr>
     <tr>
@@ -19,13 +19,13 @@
     </tr>
     <tr>
         <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?></td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
+        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
     </tr>
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index 5bff7f37f3b..bd033a783dc 100755
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -95,7 +95,7 @@ class data_field_picture extends data_field_file {// extends
         }
         */
         $str .= '<div title="'.$field->description.'">';
-        $str .= '<input type="hidden" name ="field_'.$field->id.'_0" id="field_'.$field->id.'"_0  value="fakevalue" />';
+        $str .= '<input type="hidden" name ="field_'.$field->id.'_0" id="field_'.$field->id.'_0"  value="fakevalue" />';
         $str .= get_string('picture','data'). ': <input type="file" name ="field_'.$field->id.'" id="field_'.$field->id.'" /><br />';
         $str .= get_string('optionaldescription','data') .': <input type="text" name="field_'
                 .$field->id.'_1" id="field_'.$field->id.'_1" value="'.$des.'" /><br />';
@@ -135,7 +135,7 @@ class data_field_picture extends data_field_file {// extends
             if ($template == 'listtemplate') {
                 $width = $field->param4 ? ' width="'.$field->param4.'" ':' ';
                 $height = $field->param5 ? ' height="'.$field->param5.'" ':' ';
-                $str = '<a href="view.php?d='.$field->dataid.'&rid='.$recordid.'"><img '.$width.$height.' src="'.$source.'/'.$src.'" alt="'.$alt.'" title="'.$title.'" border="0" /></a>';
+                $str = '<a href="view.php?d='.$field->dataid.'&amp;rid='.$recordid.'"><img '.$width.$height.' src="'.$source.'/'.$src.'" alt="'.$alt.'" title="'.$title.'" border="0" /></a>';
             } else {
                 $width = $field->param1 ? ' width="'.$field->param1.'" ':' ';
                 $height = $field->param2 ? ' height="'.$field->param2.'" ':' ';
diff --git a/mod/data/field/picture/mod.html b/mod/data/field/picture/mod.html
index 18ccad60654..34cc32dd6db 100755
--- a/mod/data/field/picture/mod.html
+++ b/mod/data/field/picture/mod.html
@@ -1,25 +1,73 @@
-<table width="100%"><tr><td span="2">
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
-<?php echo ($this->name()); ?></td></tr>
-<tr><td><?php echo get_string('fieldname', 'data');?>:</td><td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" /></td></tr>
-<tr><td><?php echo get_string('fielddescription', 'data');?>:</td><td><input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" /></td></tr>
-<tr><td><?php echo get_string('fieldwidthsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param1" id="param1" value = "<? if (!empty($field->param1)) echo $field->param1; ?>" />
-<tr><td><?php echo get_string('fieldheightsingleview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param2" id="param2" value = "<? if (!empty($field->param2)) echo $field->param2; ?>" />
-<tr><td><?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<? if (!empty($field->param4)) echo $field->param4; ?>" />
-<tr><td><?php echo get_string('fieldheightlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param5" id="param5" value = "<? if (!empty($field->param5)) echo $field->param5; ?>" />
-<tr><td><?php echo get_string('maxsize', 'data'); ?>:</td><td>
-    <?php
-        $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);
-	    choose_from_menu ($choices, "param3", $field->param3, "");
-    ?>
-  </td>
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
+<table width="100%">
+    <tr>
+        <td colspan="2">
+            <?php echo ($this->name()); ?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldname', 'data');?>:</td><td><input style="width:300px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fielddescription', 'data');?>:
+        </td>
+        <td>
+            <input style="width:300px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldwidthsingleview', 'data');?>:
+        </td>
+        <td>
+            <input style="width:70px;" type="text" name="param1" id="param1" value = "<? if (!empty($field->param1)) echo $field->param1; ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldheightsingleview', 'data');?>:
+        </td>
+        <td>
+            <input style="width:70px;" type="text" name="param2" id="param2" value = "<? if (!empty($field->param2)) echo $field->param2; ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldwidthlistview', 'data');?>:</td><td><input style="width:70px;" type="text" name="param4" id="param4" value = "<? if (!empty($field->param4)) echo $field->param4; ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldheightlistview', 'data');?>:
+        </td>
+        <td>
+            <input style="width:70px;" type="text" name="param5" id="param5" value = "<? if (!empty($field->param5)) echo $field->param5; ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('maxsize', 'data'); ?>:
+        </td>
+        <td>
+            <?php
+                $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);
+        	    choose_from_menu ($choices, "param3", $field->param3, "");
+            ?>
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
+            <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
+            <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
+        </td>
 </tr>
-<tr><td></td><td><input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
-<input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
-<input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
-<input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-<input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
-<input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden"></td>
+</table>
 </form>
-</td></tr></table>
-
diff --git a/mod/data/field/radiobutton/field.class.php b/mod/data/field/radiobutton/field.class.php
index 99c33387816..c496817b690 100755
--- a/mod/data/field/radiobutton/field.class.php
+++ b/mod/data/field/radiobutton/field.class.php
@@ -80,8 +80,8 @@ class data_field_radiobutton extends data_field_base {
         
         foreach (explode("\n",$field->param1) as $radio) {
             $radio = ltrim(rtrim($radio));
-            $str .= '<input type="radio" name="field_' . $field->id . '" id="field_';
-            $str .= $field->id . '" value="' . $radio . '" ';
+            $str .= '<input type="radio" name="field_' . $field->id . '" ';
+            $str .= 'value="' . $radio . '" ';
 
             if ($content == $radio) {
                 // Selected by user.
diff --git a/mod/data/field/radiobutton/mod.html b/mod/data/field/radiobutton/mod.html
index 7111842a828..0b73e09a783 100755
--- a/mod/data/field/radiobutton/mod.html
+++ b/mod/data/field/radiobutton/mod.html
@@ -1,11 +1,11 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
@@ -19,13 +19,13 @@
     </tr>
     <tr>
         <td valign="top"><?php echo get_string('fieldoptions', 'data'); ?>:</td>
-        <td><textarea style="width:300px; height:150px;" name="param1" id="param1"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
+        <td><textarea style="width:300px; height:150px;" name="param1" id="param1" cols="80" rows="10"><?php if($field->param1) {echo $field->param1;} ?></textarea></td>
     </tr>
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/text/mod.html b/mod/data/field/text/mod.html
index 82f8e9ac282..31610c59d0f 100755
--- a/mod/data/field/text/mod.html
+++ b/mod/data/field/text/mod.html
@@ -1,11 +1,11 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
@@ -24,8 +24,8 @@
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/textarea/mod.html b/mod/data/field/textarea/mod.html
index d17d2c63277..63889d02d03 100755
--- a/mod/data/field/textarea/mod.html
+++ b/mod/data/field/textarea/mod.html
@@ -1,16 +1,16 @@
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
 <table width="100%">
     <tr>
-        <td span="2">
+        <td colspan="2">
             <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
             <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
             <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden">
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
             <?php echo ($this->name()); ?>
         </td>
     </tr>
     <tr>
-        <td><Name><?php echo get_string('fieldname', 'data'); ?>:</td>
+        <td><?php echo get_string('fieldname', 'data'); ?>:</td>
         <td><input style="width:300px;" type="text" name="name" id="name" value="<?php echo($field->name); ?>" /></td>
     </tr>
     <tr>
@@ -28,8 +28,8 @@
     <tr>
         <td>&nbsp;</td>
         <td>
-            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" \>
-            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
         </td>
     </tr>
 </table>
diff --git a/mod/data/field/url/field.class.php b/mod/data/field/url/field.class.php
index 4c057a16be7..ce143435f9e 100755
--- a/mod/data/field/url/field.class.php
+++ b/mod/data/field/url/field.class.php
@@ -71,13 +71,13 @@ class data_field_url extends data_field_base {// extends
         $url = empty($contents[0])? 'http://':$contents[0];
         $text = empty($contents[1])? '':$contents[1];
 
-        $str = '<table><tr><td align="right">';
+        $str = '<div title="'.$field->description.'">';
+        $str .= '<table><tr><td align="right">';
         /*
         if ($field->description){
             $str .= '<img src="'.$CFG->pixpath.'/help.gif" alt="'.$field->description.'" title="'.$field->description.'">&nbsp;';
         }
         */
-        $str .= '<div title="'.$field->description.'">';
         $str .= get_string('url','data').':</td><td><input type="text" name="field_'.$field->id.'_0" id="field_'.$field->id.'_0" value="'.$url.'" /></td></tr>';
         $str .= '<tr><td align="right">'.get_string('text','data').':</td><td><input type="text" name="field_'.$field->id.'_1" id="field_'.$field->id.'_1" value="'.$text.'" /></td></tr>';
         $str .= '</table>';
diff --git a/mod/data/field/url/mod.html b/mod/data/field/url/mod.html
index 9d18b97a842..8c7c855c2c0 100755
--- a/mod/data/field/url/mod.html
+++ b/mod/data/field/url/mod.html
@@ -1,14 +1,36 @@
-<table width="100%"><tr><td span="2">
-<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="POST">
-<?php echo ($this->name()); ?></td></tr>
-<tr><td><Name><?php echo get_string('fieldname', 'data'); ?>:</td><td><input style="width:350px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" /></td></tr>
-<tr><td><?php echo get_string('fielddescription', 'data'); ?>:</td><td><input style="width:350px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" /></td></tr>
-<tr><td></td><td><input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
-<input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
-<input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
-<input type="hidden" name="type" value="<?php echo $this->type; ?>" />
-<input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" \>
-<input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden"></td>
-</form>
-</td></tr></table>
-
+<form name="fieldsubform" action="<?php echo $CFG->wwwroot; ?>/mod/data/fields.php?d=<?php echo ($field->dataid); ?>" method="post">
+<table width="100%">
+    <tr>
+        <td colspan="2">
+            <?php echo ($this->name()); ?>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fieldname', 'data'); ?>:
+        </td>
+        <td>
+            <input style="width:350px;" type="text" name="name" id="name" value = "<?php echo($field->name); ?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <?php echo get_string('fielddescription', 'data'); ?>:
+        </td>
+        <td>
+            <input style="width:350px;" type="text" name="description" id="description" value = "<? echo ($field->description);?>" />
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <td>
+            <input type="submit" value="<?php if ($newfield) {echo get_string('add');} else {echo get_string('save','data');} ?>" />
+            <input type="hidden" name="fid" value="<?php echo ($field->id); ?>" />
+            <input type="hidden" name="mode" value="<?php if ($newfield) {echo 'add';} else {echo 'update';} ?>" />
+            <input type="hidden" name="type" value="<?php echo $this->type; ?>" />
+            <input type="submit" value="<?php echo get_string('cancel'); ?>" onclick="document.fieldsubform.mode.value='void';" />
+            <input name="sesskey" value="<?php echo sesskey(); ?>" type="hidden" />
+        </td>
+    </tr>
+</table>
+</form>
\ No newline at end of file
diff --git a/mod/data/fields.php b/mod/data/fields.php
index 42d06b34c72..b3ae0664520 100755
--- a/mod/data/fields.php
+++ b/mod/data/fields.php
@@ -143,7 +143,7 @@
                     echo '<input name="confirm" value="1" type="hidden" />';
                     echo '<strong>'.$field->name.'</strong> - '.get_string('confirmdeletefield','data');
                     echo '<p />';
-                    echo '<input type="submit" value="'.get_string('ok').'"> ';
+                    echo '<input type="submit" value="'.get_string('ok').'" /> ';
                     echo '<input type="button" value="'.get_string('cancel').'" onclick="javascript:history.go(-1);" />';
                     echo '</form>';
                     echo '</div>';
@@ -215,9 +215,11 @@
     
     else if ($mode != 'display'){    //display main form - add new, update, delete
 
-        echo '<form name="fieldform" action="fields.php?d='.$data->id.'&amp;" method="POST">';
-        echo '<input type="hidden" name="mode" value="">';
-        echo '<input name="sesskey" value="'.sesskey().'" type="hidden">';
+        //echo '<form name="fieldform" action="fields.php?d='.$data->id.'&amp;" method="POST">';
+        echo '<form name="fieldform" action="fields.php" method="post">';
+        echo '<input name="d" type="hidden" value="'.$data->id.'" />';
+        echo '<input type="hidden" name="mode" value="" />';
+        echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
         print_simple_box_start('center','50%');
 
         ///New fields
@@ -249,12 +251,10 @@
 
                     echo '<tr><td align="center">';
                     echo '<a href="fields.php?d='.$data->id.'&amp;mode=display&amp;fid='.$field->id.'&amp;sesskey='.sesskey().'">';
-                    echo '<img src="'.$CFG->pixpath.'/t/edit.gif"
-                    height="11" width="11" border="0" alt="'.get_string('edit').'" /></a>';
+                    echo '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.get_string('edit').'" /></a>';
                     echo '&nbsp;';
                     echo '<a href="fields.php?d='.$data->id.'&amp;mode=delete&amp;fid='.$field->id.'&amp;sesskey='.sesskey().'">';
-                    echo '<img src="'.$CFG->pixpath.'/t/delete.gif"
-                    height="11" width="11" border="0" alt="'.get_string('delete').'" /></a>';
+                    echo '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.get_string('delete').'" /></a>';
                     echo '</td>';
 
                     ///Print Fieldname Column
diff --git a/mod/data/lib.php b/mod/data/lib.php
index f3932c03fd1..2a734508b4e 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -303,10 +303,11 @@ function data_generate_empty_add_form($id, $rid=0){
             //this only applies to add and single template
 
             $str .= '<div align="center">';
-            $str .= '<table><tr>';
+            $str .= '<table>';
 
             foreach ($fields as $cfield){
-
+                
+                $str .= '<tr>';
                 $str .= '<td valign="top" align="right">';
                 $str .= $cfield->name.':';
                 $str .= '</td>';
@@ -315,11 +316,12 @@ function data_generate_empty_add_form($id, $rid=0){
                 $g = data_get_field($cfield);
                 $str .= $g->display_add_field($cfield->id,$rid);
                 $str .= '</td>';
+                $str .= '</tr>';
                 unset($g);
             }
 
-            $str .= '</tr></table>';
-            $str .= '</div><p></p>';
+            $str .= '</table>';
+            $str .= '</div>';
 
         }
 
@@ -835,18 +837,18 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
     echo '<input type="hidden" id="updatepref" name="updatepref" value="1" />';
     echo '<table id="sortsearch" align="center">';
     echo '<tr>'.
-         '<td class="c0 r1"><label for="perpage">'.get_string('pagesize','data').':</label></td>';
+         '<td class="c0 r1">'.get_string('pagesize','data').':</td>';
     echo '<td class="c1 r1">';
     $pagesizes = array(1=>1,2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15,
                        20=>20,30=>30,40=>40,50=>50,100=>100,200=>200,300=>300,400=>400,500=>500,1000=>1000);
-    choose_from_menu($pagesizes,'perpage1',$perpage,'choose','','0');
+    choose_from_menu($pagesizes, 'perpage1', $perpage, 'choose', '', '0');
     echo '</td></tr>';
     echo '<tr>'.
          '<td class="c0 r0">'.get_string('search').':</td>'.
          '<td class="c1 r0"><input type="text" size="16" name="search" value="'.s($search).'" /></td>'.
          '</tr>';
     echo '<tr>';
-    echo '<tr><td class="c0 r2">';
+    echo '<td class="c0 r2">';
     echo get_string('sortby').':';
     echo '</td><td class="c1 r2">';
     //foreach field, print the option
@@ -862,15 +864,16 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
     echo '</select>';
     echo '<select name="order">';
     if ($order == "ASC") {
-        echo '<option value="ASC" SELECTED>'.get_string('ascending','data').'</option>';
+        echo '<option value="ASC" selected="selected">'.get_string('ascending','data').'</option>';
     } else {
         echo '<option value="ASC">'.get_string('ascending','data').'</option>';
     }
     if ($order == "DESC") {
-        echo '<option value="DESC" SELECTED>'.get_string('descending','data').'</option>';
+        echo '<option value="DESC" selected="selected">'.get_string('descending','data').'</option>';
     } else {
         echo '<option value="DESC">'.get_string('descending','data').'</option>';
     }
+    echo '</select>';
     //print ASC or DESC
     echo '</td></tr><tr>';
     echo '<td colspan="2" align="center" class="r3">';
@@ -881,7 +884,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
 
 //silly function that prints a button
 function data_print_approve_button($recordid, $d, $page='0', $rid='0', $search='', $sort='', $order='') {
-    $str= '<div align="center"><form action="approve.php" method="GET">';
+    $str= '<div align="center"><form action="approve.php" method="get">';
     $str.= '<input type="hidden" name="d" value="'.$d.'" />';
     $str.= '<input type="hidden" name="rid" value="'.$rid.'" />';
     $str.= '<input type="hidden" name="page" value="'.$page.'" />';
@@ -1055,7 +1058,7 @@ function data_print_comments($data, $record , $search, $template, $sort, $page=0
     }
     
     //prints silly comment form
-    echo '<p /><div align="center"><form method="POST" action="comment.php">';
+    echo '<p /><div align="center"><form method="post" action="comment.php">';
     echo '<input type="hidden" name="mode" value="add" />';
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
     echo '<input type="hidden" name="recordid" value="'.$record->id.'" />';
diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index 4b4739b4604..8cf7e431e93 100755
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -37,7 +37,7 @@
         $row[] = new tabobject('add', $CFG->wwwroot.'/mod/data/add.php?d='.$data->id, get_string('add','data'));
     }
     if (isteacher($course->id)) {
-        $row[] = new tabobject('templates', $CFG->wwwroot.'/mod/data/templates.php?d='.$data->id.'&mode=singletemplate', get_string('templates','data'));
+        $row[] = new tabobject('templates', $CFG->wwwroot.'/mod/data/templates.php?d='.$data->id.'&amp;mode=singletemplate', get_string('templates','data'));
         $row[] = new tabobject('fields', $CFG->wwwroot.'/mod/data/fields.php?d='.$data->id, get_string('fields','data'));
     }
 
@@ -82,5 +82,5 @@
 /// Print out the tabs and continue!
 
     print_tabs($tabs, $currenttab, $inactive);
-
+    
 ?>
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 85521b8e68c..b2dfdd398a3 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -116,8 +116,8 @@
 
     echo '<div align="center">'.get_string('header'.$mode,'data').'</div><br />';
 
-    echo '<form name="tempform" action="templates.php?d='.$data->id.'&amp;mode='.$mode.'" method="POST">';
-    echo '<input name="sesskey" value="'.sesskey().'" type="hidden">';
+    echo '<form name="tempform" action="templates.php?d='.$data->id.'&amp;mode='.$mode.'" method="post">';
+    echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
     //print button to autogen all forms, if all templates are empty
 
     $data = get_record('data', 'id', $d);    //reload because of possible updates so far!
@@ -137,7 +137,6 @@
     if ($fields = get_records('data_fields','dataid',$data->id)){
         foreach ($fields as $field) {
             echo '<option value="[['.$field->name.']]">'.$field->name.' ('.$field->type.')</option>';
-            echo '[['.$field->name.']]'.'<br />';
         }
     }
     //print special tags
diff --git a/mod/data/view.php b/mod/data/view.php
index 8e80b405cb4..b366fd79c8b 100755
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -197,6 +197,7 @@
     //if not editting teacher, check whether user has sufficient records to view
     if (!isteacheredit($course->id) and data_numentries($data) < $data->requiredentriestoview){
         notify (($data->requiredentriestoview - data_numentris(data)).'&nbsp;'.get_string('insufficiententries','data'));
+        echo '</td></tr></table>';
         print_footer($course);
         exit;
     }
@@ -340,6 +341,7 @@
         }
             
         data_print_preference_form($data, $perpage, $search);
+        echo '</td></tr></table>';
         print_footer($course);
         exit;
     }
@@ -371,11 +373,10 @@
     }
 
     data_print_preference_form($data, $perpage, $search, $sort, $order);
-
-/// Finish the page
-
+    
+    // Finish the page
     echo '</td></tr></table>';
-
+    
     print_footer($course);
 
-?>
+?>
\ No newline at end of file