diff --git a/admin/auth.php b/admin/auth.php
index 10035f82ef1..e092f8713e9 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -217,7 +217,7 @@ admin_externalpage_print_header($adminroot);
 print_simple_box(get_string('configauthenticationplugins', 'admin'), 'center', '700');
 
 echo "<form $CFG->frametarget id=\"authmenu\" method=\"post\" action=\"auth.php\">";
-echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
+echo "<fieldset class=\"invisiblefieldset\"><input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" /></fieldset>";
 print_table($table);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -225,7 +225,7 @@ print_table($table);
 $guestoptions[0] = get_string("hide");
 $guestoptions[1] = get_string("show");
 
-echo '<hr>';
+echo '<hr />';
 print_heading(get_string('auth_common_settings', 'auth'));
 echo '<table cellspacing="0" cellpadding="5" border="0" align="center">';
 
diff --git a/admin/pagelib.php b/admin/pagelib.php
index 5832e91a678..905e442554e 100644
--- a/admin/pagelib.php
+++ b/admin/pagelib.php
@@ -110,11 +110,10 @@ class page_admin extends page_base {
                                     // if not, print_header() has to be called with a $section parameter
 
         if ($this->user_allowed_editing()) {
-            $buttons = '<table><tr><td><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
-                       '<input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
+            $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
+                       '<fieldset class="invisiblefieldset"><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                        '<input type="hidden" name="section" value="'.$this->section.'" />'.
-                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>' . 
-                       '</tr></table>';
+                       '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></fieldset></form></div>';
         } else {
             $buttons = '&nbsp;';
         }
diff --git a/lib/tablelib.php b/lib/tablelib.php
index e4a86d98b48..60b46d16fcd 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -528,7 +528,12 @@ class flexible_table {
             }
             else {
                 // took out nowrap for accessibility, might need replacement
-                echo '<th class="header c'.$index.$this->column_class[$column].'" '.$this->make_styles_string($this->column_style[$column]).' scope="col" style="white-space:nowrap;">'.$this->headers[$index].$icon_sort.'<div class="commands">'.$icon_hide.'</div></th>';
+                 if (!is_array($this->column_style[$column])) {
+                    $usestyles = array('white-space:nowrap');
+                 } else {
+                    $usestyles = $this->column_style[$column]+array('white-space'=>'nowrap');
+                 }
+                echo '<th class="header c'.$index.$this->column_class[$column].'" '.$this->make_styles_string($usestyles).' scope="col">'.$this->headers[$index].$icon_sort.'<div class="commands">'.$icon_hide.'</div></th>';
             }
 
         }