diff --git a/course/category.php b/course/category.php
index d667bf3b957..5fcce5afadd 100644
--- a/course/category.php
+++ b/course/category.php
@@ -123,11 +123,9 @@
 
     make_categories_list($displaylist, $parentlist, "");
 
-    echo '<table align="center"><tr><td align="right">';
-    echo "<p>$strcategories:</p>";
-    echo "</td><td>";
-    popup_form("category.php?id=", $displaylist, "switchcategory", "$category->id", "", "", "", false);
-    echo "</td></tr></table><br />";
+    echo '<div class="categorypicker">';
+    popup_form('category.php?id=', $displaylist, 'switchcategory', $category->id, '', '', '', false, 'self', $strcategories.':');
+    echo '</div>';
 
 
 /// Editing functions
@@ -412,7 +410,6 @@
         echo '<br />';
     }
     
-    echo '<center>';
     if (has_capability('moodle/category:update', get_context_instance(CONTEXT_SYSTEM, SITEID)) and $numcourses > 1) {           /// Print button to re-sort courses by name
         unset($options);
         $options['id'] = $category->id;
@@ -441,8 +438,6 @@
     
     print_course_search();
     
-    echo "</center>";
-    
     if ($adminediting) {
         admin_externalpage_print_footer($adminroot);
     } else {
diff --git a/course/lib.php b/course/lib.php
index ae8133bcacc..d443e7ce084 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -472,7 +472,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
 
     print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
 
-    echo "<table class=\"logtable\" border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"0\">\n";
+    echo "<table class=\"logtable\" align=\"center\" cellpadding=\"3\" cellspacing=\"0\">\n";
     echo "<tr>";
     if ($course->id == SITEID) {
         echo "<th class=\"c0 header\" scope=\"col\">".get_string('course')."</th>\n";
@@ -578,7 +578,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC",
 
     print_paging_bar($totalcount, $page, $perpage, "$url&amp;perpage=$perpage&amp;");
 
-    echo "<table class=\"logtable\" border=\"0\" align=\"center\" cellpadding=\"3\" cellspacing=\"0\">\n";
+    echo "<table class=\"logtable\" align=\"center\" cellpadding=\"3\" cellspacing=\"0\">\n";
     echo "<tr>";
     if ($course->id == SITEID) {
         echo "<th class=\"c0 header\">".get_string('course')."</th>\n";
@@ -1650,12 +1650,12 @@ function print_category_info($category, $depth, $files = false) {
 
     $coursecount = count_records('course') <= FRONTPAGECOURSELIMIT;
     if ($files and $coursecount) {
-        $catimage = '<img src="'.$CFG->pixpath.'/i/course.gif" width="16" height="16" border="0" alt="" />';
+        $catimage = '<img src="'.$CFG->pixpath.'/i/course.gif" alt="" />';
     } else {
         $catimage = "&nbsp;";
     }
 
-    echo "\n\n".'<table border="0" cellpadding="3" cellspacing="0" width="100%">';
+    echo "\n\n".'<table class="categorylist">';
 
     if ($files and $coursecount) {
         $courses = get_courses($category->id, 'c.sortorder ASC', 'c.id,c.sortorder,c.visible,c.fullname,c.shortname,c.password,c.summary,c.guest,c.cost,c.currency');
@@ -1671,7 +1671,7 @@ function print_category_info($category, $depth, $files = false) {
         }
 
         echo '<td valign="top">'.$catimage.'</td>';
-        echo '<td valign="top" width="100%" class="category name">';
+        echo '<td valign="top" class="category name">';
         echo '<a '.$catlinkcss.' href="'.$CFG->wwwroot.'/course/category.php?id='.$category->id.'">'.$category->name.'</a>';
         echo '</td>';
         echo '<td class="category info">&nbsp;</td>';
@@ -1680,28 +1680,28 @@ function print_category_info($category, $depth, $files = false) {
         if ($courses && !(isset($CFG->max_category_depth)&&($depth>=$CFG->max_category_depth-1))) {
             foreach ($courses as $course) {
                 $linkcss = $course->visible ? '' : ' class="dimmed" ';
-                echo '<tr><td valign="top" width="30">&nbsp;';
-                echo '</td><td valign="top" width="100%" class="course name">';
+                echo '<tr><td valign="top">&nbsp;';
+                echo '</td><td valign="top" class="course name">';
                 echo '<a '.$linkcss.' href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'.$course->fullname.'</a>';
-                echo '</td><td align="right" valign="top" nowrap="nowrap" class="course info">';
+                echo '</td><td align="right" valign="top" class="course info">';
                 if ($course->guest ) {
                     echo '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-                    echo '<img hspace="1" alt="'.$strallowguests.'" height="16" width="16" border="0" src="'.$CFG->pixpath.'/i/guest.gif" /></a>';
+                    echo '<img alt="'.$strallowguests.'" src="'.$CFG->pixpath.'/i/guest.gif" /></a>';
                 } else {
-                    echo '<img alt="" height="16" width="18" border="0" src="'.$CFG->pixpath.'/spacer.gif" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$CFG->pixpath.'/spacer.gif" />';
                 }
                 if ($course->password) {
                     echo '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
-                    echo '<img hspace="1" alt="'.$strrequireskey.'" height="16" width="16" border="0" src="'.$CFG->pixpath.'/i/key.gif" /></a>';
+                    echo '<img alt="'.$strrequireskey.'" src="'.$CFG->pixpath.'/i/key.gif" /></a>';
                 } else {
-                    echo '<img alt="" height="16" width="18" border="0" src="'.$CFG->pixpath.'/spacer.gif" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$CFG->pixpath.'/spacer.gif" />';
                 }
                 if ($course->summary) {
                     link_to_popup_window ('/course/info.php?id='.$course->id, 'courseinfo',
-                                          '<img hspace="1" alt="'.$strsummary.'" height="16" width="16" border="0" src="'.$CFG->pixpath.'/i/info.gif" />',
+                                          '<img alt="'.$strsummary.'" src="'.$CFG->pixpath.'/i/info.gif" />',
                                            400, 500, $strsummary);
                 } else {
-                    echo '<img alt="" height="16" width="18" border="0" src="'.$CFG->pixpath.'/spacer.gif" />';
+                    echo '<img alt="" style="width:18px;height:16px;" src="'.$CFG->pixpath.'/spacer.gif" />';
                 }
                 echo '</td></tr>';
             }
@@ -1717,7 +1717,7 @@ function print_category_info($category, $depth, $files = false) {
             echo '</td>';
         }
 
-        echo '<td valign="top" width="100%" class="category name">';
+        echo '<td valign="top" class="category name">';
         echo '<a '.$catlinkcss.' href="'.$CFG->wwwroot.'/course/category.php?id='.$category->id.'">'.$category->name.'</a>';
         echo '</td>';
         echo '<td valign="top" class="category number">';
@@ -1865,23 +1865,22 @@ function print_course_search($value="", $return=false, $format="plain") {
 
     if ($format == 'plain') {
         $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
-        $output .= '<center><p align="center" class="coursesearchbox">';
+        $output .= '<fieldset class="coursesearchbox invisiblefieldset">';
         $output .= '<input type="text" size="30" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
-        $output .= '</p></center></form>';
+        $output .= '</fieldset></form>';
     } else if ($format == 'short') {
         $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
-        $output .= '<center><p align="center" class="coursesearchbox">';
+        $output .= '<fieldset class="coursesearchbox invisiblefieldset">';
         $output .= '<input type="text" size="12" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
-        $output .= '</p></center></form>';
+        $output .= '</fieldset></form>';
     } else if ($format == 'navbar') {
-        $output  = '<form id="coursesearch" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
-        $output .= '<table border="0" cellpadding="0" cellspacing="0"><tr><td nowrap="nowrap">';
+        $output  = '<form id="coursesearchnavbar" action="'.$CFG->wwwroot.'/course/search.php" method="get">';
+        $output .= '<fieldset class="coursesearchbox invisiblefieldset">';
         $output .= '<input type="text" size="20" name="search" alt="'.s($strsearchcourses).'" value="'.s($value, true).'" />';
         $output .= '<input type="submit" value="'.s($strsearchcourses).'" />';
-        $output .= '</td></tr></table>';
-        $output .= '</form>';
+        $output .= '</fieldset></form>';
     }
 
     if ($return) {
diff --git a/lib/weblib.php b/lib/weblib.php
index 9bf4b33b0e2..e609d26b517 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -930,7 +930,8 @@ function print_textfield ($name, $value, $alt = '',$size=50,$maxlength=0, $retur
  * @return string If $return is true then the entire form is returned as a string.
  * @todo Finish documenting this function<br>
  */
-function popup_form($common, $options, $formid, $selected='', $nothing='choose', $help='', $helptext='', $return=false, $targetwindow='self') {
+function popup_form($common, $options, $formid, $selected='', $nothing='choose', $help='', $helptext='', $return=false,
+$targetwindow='self', $selectlabel='') {
 
     global $CFG;
     static $go, $choose;   /// Locally cached, in case there's lots on a page
@@ -963,7 +964,11 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
         $button = '';
     }
 
-    $output .= '<div>'.$button.'<select name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
+    if ($selectlabel) {
+        $selectlabel = '<label for="'.$formid.'_jump">'.$selectlabel.'</label>';
+    }
+
+    $output .= '<fieldset class="invisiblefieldset">'.$selectlabel.$button.'<select id="'.$formid.'_jump" name="jump" onchange="'.$targetwindow.'.location=document.getElementById(\''.$formid.'\').jump.options[document.getElementById(\''.$formid.'\').jump.selectedIndex].value;">'."\n";
 
     if ($nothing != '') {
         $output .= "   <option value=\"javascript:void(0)\">$nothing</option>\n";
@@ -1043,7 +1048,7 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose',
                "\n//<![CDATA[\n".
                'document.getElementById("noscript'.$formid.'").style.display = "none";'.
                "\n//]]>\n".'</script>';
-    $output .= '</div>';
+    $output .= '</fieldset>';
     $output .= '</form>' . "\n";
 
     if ($return) {
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index f3d136ceed0..f0a226886cb 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1354,6 +1354,11 @@ body#course-view .headingblock {
   border-style:solid;
 }
 
+.categorypicker {
+  text-align:center;
+  padding-bottom:10px;
+}
+
 .coursebox .cost {
   padding-top: 20px;
 }
@@ -1364,6 +1369,18 @@ body#course-view .headingblock {
   margin:0;
 }
 
+#course-category #renameform {
+  text-align:center;
+}
+
+#course-category .singlebutton {
+  text-align:center;
+}
+
+#course-category #coursesearch {
+  text-align:center;
+}
+
 
 /***
  *** Doc