diff --git a/lib/weblib.php b/lib/weblib.php
index 67a472b0a20..9ff09454a28 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3909,10 +3909,11 @@ function update_module_button($moduleid, $courseid, $string) {
         $string = get_string('updatethis', '', $string);
 
         return "<form $CFG->frametarget method=\"get\" action=\"$CFG->wwwroot/course/mod.php\">".
+               "<fieldset class='invisiblefieldset'>".
                "<input type=\"hidden\" name=\"update\" value=\"$moduleid\" />".
                "<input type=\"hidden\" name=\"return\" value=\"true\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />".
-               "<input type=\"submit\" value=\"$string\" /></form>";
+               "<input type=\"submit\" value=\"$string\" /></fieldset></form>";
     } else {
         return '';
     }
@@ -4847,7 +4848,7 @@ function notice_yesno ($message, $linkyes, $linkno, $optionsyes=NULL, $optionsno
     $linkno = clean_text($linkno);
 
     print_simple_box_start('center', '60%', '', 5, 'generalbox', 'notice');
-    echo '<p align="center">'. $message .'</p>';
+    echo '<p style="text-align:center">'. $message .'</p>';
     echo '<table align="center" cellpadding="20"><tr><td>';
     print_single_button($linkyes, $optionsyes, get_string('yes'), $methodyes, $CFG->framename);
     echo '</td><td>';
diff --git a/mod/data/edit.php b/mod/data/edit.php
index a1818cfd5ca..e89569c7a54 100755
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -307,7 +307,7 @@
             print_heading(get_string('uploadrecords', 'data'), '', 3);
 
             $maxuploadsize = get_max_upload_file_size();
-            echo '<div align="center">';
+            echo '<div style="text-align:center">';
             echo '<form enctype="multipart/form-data" action="import.php" method="post">';
             echo '<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">';
             echo '<input name="d" value="'.$data->id.'" type="hidden" />';
@@ -332,7 +332,7 @@
             echo '</div>';
             print_simple_box_end();
         } else {
-            echo '<div align="center">';
+            echo '<div style="text-align:center">';
             echo '<a href="edit.php?d='.$data->id.'&amp;import=1">'.get_string('uploadrecords', 'data').'</a>';
             echo '</div>';
         }
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 86d846dce5d..aa099a2bcc1 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -156,7 +156,7 @@
             add_to_log($course->id, 'data', 'templates saved', "templates.php?id=$cm->id&amp;d=$data->id", $data->id, $cm->id);
         }
     } else {
-        echo '<div class="littleintro" align="center">'.get_string('header'.$mode,'data').'</div>';
+        echo '<div class="littleintro" style="text-align:center">'.get_string('header'.$mode,'data').'</div>';
     }
 
 /// If everything is empty then generate some defaults
@@ -170,6 +170,7 @@
 
 
     echo '<form id="tempform" action="templates.php?d='.$data->id.'&amp;mode='.$mode.'" method="post">';
+    echo '<fieldset class="invisiblefieldset">';
     echo '<input name="sesskey" value="'.sesskey().'" type="hidden" />';
     // Print button to autogen all forms, if all templates are empty
 
@@ -187,7 +188,7 @@
         echo '<tr>';
         echo '<td>&nbsp;</td>';
         echo '<td>';
-        echo '<div align="center"><label for="edit-listtemplateheader">'.get_string('header','data').'</label></div>';
+        echo '<div style="text-align:center"><label for="edit-listtemplateheader">'.get_string('header','data').'</label></div>';
         print_textarea($usehtmleditor, 10, 72, 0, 0, 'listtemplateheader', $data->listtemplateheader);
         echo '</td>';
         echo '</tr>';
@@ -256,9 +257,9 @@
 
     echo '<td>';
     if ($mode == 'listtemplate'){
-        echo '<div align="center"><label for="edit-template">'.get_string('multientry','data').'</label></div>';
+        echo '<div style="text-align:center"><label for="edit-template">'.get_string('multientry','data').'</label></div>';
     } else {
-        echo '<div align="center"><label for="edit-template">'.get_string($mode,'data').'</label></div>';
+        echo '<div style="text-align:center"><label for="edit-template">'.get_string($mode,'data').'</label></div>';
     }
 
     print_textarea($usehtmleditor, 20, 72, 0, 0, 'template', $data->{$mode});
@@ -269,7 +270,7 @@
         echo '<tr>';
         echo '<td>&nbsp;</td>';
         echo '<td>';
-        echo '<div align="center"><label for="edit-listtemplatefooter">'.get_string('footer','data').'</label></div>';
+        echo '<div style="text-align:center"><label for="edit-listtemplatefooter">'.get_string('footer','data').'</label></div>';
         print_textarea($usehtmleditor, 10, 72, 0, 0, 'listtemplatefooter', $data->listtemplatefooter);
         echo '</td>';
         echo '</tr>';
@@ -277,19 +278,20 @@
         echo '<tr>';
         echo '<td>&nbsp;</td>';
         echo '<td>';
-        echo '<div align="center"><label for="edit-rsstitletemplate">'.get_string('rsstitletemplate','data').'</label></div>';
+        echo '<div style="text-align:center"><label for="edit-rsstitletemplate">'.get_string('rsstitletemplate','data').'</label></div>';
         print_textarea($usehtmleditor, 10, 72, 0, 0, 'rsstitletemplate', $data->rsstitletemplate);
         echo '</td>';
         echo '</tr>';
     }
 
-    echo '<tr><td align="center" colspan="2">';
+    echo '<tr><td style="text-align:center" colspan="2">';
     echo '<input type="submit" value="'.get_string('savetemplate','data').'" />&nbsp;';
 
     echo '</td></tr></table>';
 
 
     print_simple_box_end();
+    echo '</fieldset>';
     echo '</form>';
     if ($usehtmleditor) {
         use_html_editor('template');
diff --git a/user/view.php b/user/view.php
index 14a85b97920..a80f4988b66 100644
--- a/user/view.php
+++ b/user/view.php
@@ -353,7 +353,7 @@
     if ($currentuser and !isguest()) {
         if ($internalpassword ) {
             echo "<td nowrap=\"nowrap\"><form action=\"$internalpassword\" method=\"get\">";
-            echo "<fieldset>";
+            echo "<fieldset class='invisiblefieldset'>";
             echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
             if (!empty($USER->realuser)) {
                 // changing of password when "Logged in as" is not allowed
@@ -365,7 +365,7 @@
             echo "</form></td>";
         } elseif ( method_exists($userauth, 'change_password_url') and strlen($userauth->change_password_url())) {
             echo "<td nowrap=\"nowrap\"><form action=\"".$userauth->change_password_url()."\" method=\"get\">";
-            echo "<fieldset>";
+            echo "<fieldset class='invisiblefieldset'>";
             echo "<input type=\"submit\" value=\"".get_string("changepassword")."\" />";
             echo "</fieldset>";
             echo "</form></td>";
@@ -382,7 +382,7 @@
              get_user_roles($coursecontext, $user->id)) ) {                          // This user has roles
 
             echo '<td nowrap="nowrap"><form action="../course/unenrol.php" method="get">';
-            echo "<fieldset>";
+            echo "<fieldset class='invisiblefieldset'>";
             echo '<input type="hidden" name="id" value="'.$course->id.'" />';
             echo '<input type="hidden" name="user" value="'.$user->id.'" />';
             echo '<input type="submit" value="'.get_string('unenrolme', '', $course->shortname).'" />';
@@ -393,7 +393,7 @@
 
     if ($USER->id != $user->id  && has_capability('moodle/user:loginas', $coursecontext))  {
         echo '<td nowrap="nowrap"><form action="'.$CFG->wwwroot.'/course/loginas.php" method="get">';
-        echo "<fieldset>";
+        echo "<fieldset class='invisiblefieldset'>";
         echo '<input type="hidden" name="id" value="'.$course->id.'" />';
         echo '<input type="hidden" name="user" value="'.$user->id.'" />';
         echo '<input type="submit" value="'.get_string('loginas').'" />';
@@ -409,13 +409,13 @@
                 $messagebuttonname = get_string("messages", "message");
             }
             echo "<td nowrap=\"nowrap\"><form target=\"message\" action=\"../message/index.php\" method=\"get\">";
-            echo "<fieldset>";
+            echo "<fieldset class='invisiblefieldset'>";
             echo "<input type=\"submit\" value=\"$messagebuttonname\" onclick=\"return openpopup('/message/index.php', 'message', 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0);\" />";
             echo "</fieldset>";
             echo "</form></td>";
         } else {
             echo "<td nowrap=\"nowrap\"><form target=\"message_$user->id\" action=\"../message/discussion.php\" method=\"get\">";
-            echo "<fieldset>";
+            echo "<fieldset class='invisiblefieldset'>";
             echo "<input type=\"hidden\" name=\"id\" value=\"$user->id\" />";
             echo "<input type=\"submit\" value=\"".get_string("sendmessage", "message")."\" onclick=\"return openpopup('/message/discussion.php?id=$user->id', 'message_$user->id', 'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0);\" />";
             echo "</fieldset>";
@@ -425,7 +425,7 @@
     // Authorize.net: User Payments
     if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
         echo "<td nowrap=\"nowrap\"><form action=\"../enrol/authorize/index.php\" method=\"get\">";
-        echo "<fieldset>";
+        echo "<fieldset class='invisiblefieldset'>";
         echo "<input type=\"hidden\" name=\"course\" value=\"$course->id\" />";
         echo "<input type=\"hidden\" name=\"user\" value=\"$user->id\" />";
         echo "<input type=\"submit\" value=\"".get_string('payments')."\" />";