diff --git a/mod/assignment/config.html b/mod/assignment/config.html
index a0701f3b1e3..79fe9dbfe5b 100644
--- a/mod/assignment/config.html
+++ b/mod/assignment/config.html
@@ -1,9 +1,9 @@
 <form method="post" action="module.php" name="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
-<table cellpadding=9 cellspacing=0 >
-<tr valign=top>
-	<td align=right><p>assignment_maxbytes:</td>
+<table cellpadding="9" cellspacing="0">
+<tr valign="top">
+	<td align="right">assignment_maxbytes:</td>
     <td><?php
     $choices = get_max_upload_sizes($CFG->maxbytes);
     choose_from_menu ($choices, "assignment_maxbytes", $CFG->assignment_maxbytes, "");
@@ -15,7 +15,7 @@
 </tr>
 
 <tr>
-    <td colspan=3 align=center>
+    <td colspan="3" align="center">
 	<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
 </tr>
 </table>
diff --git a/mod/attendance/config.html b/mod/attendance/config.html
index 6f6137c777d..a906c99fe09 100644
--- a/mod/attendance/config.html
+++ b/mod/attendance/config.html
@@ -1,9 +1,35 @@
+<?php
+   if (!isset($CFG->attendance_dynsection)) {
+       $CFG->attendance_dynsection = '';
+   }
+   if (!isset($CFG->attendance_default_hours)) {
+       $CFG->attendance_default_hours = '';
+   }
+   if (!isset($CFG->attendance_tardies_per_absence)) {
+       $CFG->attendance_tardies_per_absence = '';
+   }
+   if (!isset($CFG->attendance_hours_in_full_report)) {
+       $CFG->attendance_hours_in_full_report = '';
+   }
+   if (!isset($CFG->attendance_default_student_status)) {
+       $CFG->attendance_default_student_status = '';
+   }
+   if (!isset($CFG->attendance_autoattend)) {
+       $CFG->attendance_autoattend = '';
+   }
+   if (!isset($CFG->attendance_grade)) {
+       $CFG->attendance_grade = '';
+   }
+   if (!isset($CFG->attendance_maxgrade)) {
+       $CFG->attendance_maxgrade = '';
+   }
+?>
 <form method="post" action="module.php" name="form">
 <input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
-	<td align=right><p>attendance_dynsection:</td>
+	<td align=right>attendance_dynsection:</td>
 	<td>
 		<?php  $optds[0] = "No";$optds[1] = "Yes";
 		choose_from_menu($optds, "attendance_dynsection", $CFG->attendance_dynsection, ""); ?>
@@ -14,7 +40,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_default_hours:</td>
+	<td align=right>attendance_default_hours:</td>
 	<td>
 		<?php  for ($i=1;$i<=24;$i++){ $opt[$i] = $i; }
 		choose_from_menu($opt, "attendance_default_hours", $CFG->attendance_default_hours, ""); ?>
@@ -25,7 +51,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_tardies_per_absence:</td>
+	<td align=right>attendance_tardies_per_absence:</td>
 	<td>
 		<?php  for ($i=1;$i<=24;$i++){ $opt2[$i] = $i; }
 		choose_from_menu($opt2, "attendance_tardies_per_absence", $CFG->attendance_tardies_per_absence, "none","","0"); ?>
@@ -36,7 +62,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_hours_in_full_report:</td>
+	<td align=right>attendance_hours_in_full_report:</td>
 	<td>
 		<?php  for ($i=10;$i<=24;$i++){ $opt3[$i] = $i; }
 		choose_from_menu($opt3, "attendance_hours_in_full_report", $CFG->attendance_tardies_per_absence, ""); ?>
@@ -47,7 +73,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_default_student_status:</td>
+	<td align=right>attendance_default_student_status:</td>
 	<td>
 		<?php
       $A = get_string("absentlong","attendance");
@@ -75,7 +101,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_autoattend:</td>
+	<td align=right>attendance_autoattend:</td>
 	<td>
 		<?php  $optaa[0] = "No";$optaa[1] = "Yes";
 		choose_from_menu($optaa, "attendance_autoattend", $CFG->attendance_autoattend, ""); ?>
@@ -86,7 +112,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_grade:</td>
+	<td align=right>attendance_grade:</td>
 	<td>
 		<?php  $optgr[0] = "No";$optgr[1] = "Yes";
 		choose_from_menu($optgr, "attendance_grade", $CFG->attendance_grade, ""); ?>
@@ -97,7 +123,7 @@
 </tr>
 
 <tr valign=top>
-	<td align=right><p>attendance_maxgrade:</td>
+	<td align=right>attendance_maxgrade:</td>
 	<td>
 		<?php  for ($i=0;$i<=100;$i++){ $opt4[$i] = $i; }
 		choose_from_menu($opt4, "attendance_maxgrade", $CFG->attendance_maxgrade, ""); ?>
diff --git a/mod/chat/config.html b/mod/chat/config.html
index 27c3f25ea7f..1fde636e85e 100644
--- a/mod/chat/config.html
+++ b/mod/chat/config.html
@@ -12,7 +12,7 @@
 
 
 <tr valign="top">
-	<td align="right"><p>chat_method:</td>
+	<td align="right">chat_method:</td>
 	<td>
     <?php
        unset($options);
@@ -26,7 +26,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>chat_refresh_userlist:</td>
+	<td align="right">chat_refresh_userlist:</td>
 	<td>
     <input name="chat_refresh_userlist" type="text" size="5" value="<?php p($CFG->chat_refresh_userlist) ?>" />
     </td>
@@ -35,7 +35,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>chat_old_ping:</td>
+	<td align="right">chat_old_ping:</td>
 	<td>
     <input name="chat_old_ping" type="text" size="5" value="<?php p($CFG->chat_old_ping) ?>" />
     </td>
@@ -52,7 +52,7 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p>chat_refresh_room:</td>
+	<td align="right">chat_refresh_room:</td>
 	<td>
     <input name="chat_refresh_room" type="text" size="5" value="<?php p($CFG->chat_refresh_room) ?>" />
     </td>
@@ -69,7 +69,7 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p>chat_serverhost:</td>
+	<td align="right">chat_serverhost:</td>
 	<td>
     <input name="chat_serverhost" type="text" size="20" value="<?php p($CFG->chat_serverhost) ?>" />
     </td>
@@ -78,7 +78,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>chat_serverip:</td>
+	<td align="right">chat_serverip:</td>
 	<td>
     <input name="chat_serverip" type="text" size="16" value="<?php p($CFG->chat_serverip) ?>" />
     </td>
@@ -87,7 +87,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>chat_serverport:</td>
+	<td align="right">chat_serverport:</td>
 	<td>
     <input name="chat_serverport" type="text" size="5" value="<?php p($CFG->chat_serverport) ?>" />
     </td>
@@ -96,7 +96,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>chat_servermax:</td>
+	<td align="right">chat_servermax:</td>
 	<td>
     <input name="chat_servermax" type="text" size="5" value="<?php p($CFG->chat_servermax) ?>" />
     </td>
diff --git a/mod/forum/config.html b/mod/forum/config.html
index f43c17a9046..d43787360bd 100644
--- a/mod/forum/config.html
+++ b/mod/forum/config.html
@@ -3,7 +3,7 @@
 
 <table cellpadding="9" cellspacing="0" >
 <tr valign="top">
-    <td align="right"><p>forum_displaymode:</td>
+    <td align="right">forum_displaymode:</td>
     <td>
     <?php choose_from_menu ($FORUM_LAYOUT_MODES, "forum_displaymode", $CFG->forum_displaymode, "", "", ""); ?>
     </td>
@@ -12,7 +12,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_replytouser:</td>
+    <td align="right">forum_replytouser:</td>
     <td>
     <?php
        unset($options);
@@ -26,7 +26,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_shortpost:</td>
+    <td align="right">forum_shortpost:</td>
     <td>
     <input name="forum_shortpost" type="text" size="5" value="<?php p($CFG->forum_shortpost) ?>" />
     </td>
@@ -35,7 +35,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_longpost:</td>
+    <td align="right">forum_longpost:</td>
     <td>
     <input name="forum_longpost" type="text" size="5" value="<?php p($CFG->forum_longpost) ?>" />
     </td>
@@ -44,7 +44,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_manydiscussions:</td>
+    <td align="right">forum_manydiscussions:</td>
     <td>
     <input name="forum_manydiscussions" type="text" size="5" value="<?php p($CFG->forum_manydiscussions) ?>" />
     </td>
@@ -53,7 +53,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_maxbytes:</td>
+    <td align="right">forum_maxbytes:</td>
     <td><?php
     $choices = get_max_upload_sizes($CFG->maxbytes);
     choose_from_menu ($choices, "forum_maxbytes", $CFG->forum_maxbytes, "");
@@ -65,7 +65,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"><p>forum_trackreadposts:</td>
+    <td align="right">forum_trackreadposts:</td>
     <td>
     <?php
        unset($options);
@@ -79,7 +79,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_oldpostdays:</td>
+    <td align="right">forum_oldpostdays:</td>
     <td>
     <input name="forum_oldpostdays" type="text" size="5" value="<?php p($CFG->forum_oldpostdays) ?>" />
     </td>
@@ -88,7 +88,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_usermarksread:</td>
+    <td align="right">forum_usermarksread:</td>
     <td>
     <?php
        unset($options);
@@ -102,7 +102,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>forum_cleanreadtime:</td>
+    <td align="right">forum_cleanreadtime:</td>
     <td>
     <?php
        unset($options);
@@ -139,7 +139,7 @@
 </tr>
 
 <tr valign="top">
-        <td align="right"><p>forum_enablerssfeeds:</td>
+        <td align="right">forum_enablerssfeeds:</td>
         <td>
     <?php
         if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 3b5fdde7d64..e28eba3c12c 100644
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -10,7 +10,7 @@
     <td colspan = 3 align=center><strong><?php print_string("glossaryleveldefaultsettings","glossary") ?></strong></td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_entbypage:</td>
+    <td align=right>glossary_entbypage:</td>
     <td>
     <input name=glossary_entbypage type=text size=3 value="<?php p(isset($CFG->glossary_entbypage) ? $CFG->glossary_entbypage : 10) ?>" />
     </td>
@@ -19,7 +19,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_studentspost:</td>
+    <td align=right>glossary_studentspost:</td>
     <td>
     <select size=1 name=glossary_studentspost>
 <?php 
@@ -40,7 +40,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_dupentries:</td>
+    <td align=right>glossary_dupentries:</td>
     <td>
     <select size=1 name=glossary_dupentries>
 <?php 
@@ -61,7 +61,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_allowcomments:</td>
+    <td align=right>glossary_allowcomments:</td>
     <td>
     <select size=1 name=glossary_allowcomments>
 <?php 
@@ -82,7 +82,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_linkbydefault:</td>
+    <td align=right>glossary_linkbydefault:</td>
     <td>
     <select size=1 name=glossary_linkbydefault>
 <?php 
@@ -103,7 +103,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_defaultapproval:</td>
+    <td align=right>glossary_defaultapproval:</td>
     <td>
     <select size=1 name=glossary_defaultapproval>
 <?php 
@@ -123,11 +123,40 @@
     <?php print_string("cnfapprovalstatus", "glossary") ?>
     </td>
 </tr>
+<tr valign=top>
+        <td align=right>glossary_enablerssfeeds:</td>
+        <td>
+    <?php
+        if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
+            print_string("no");
+        } else {
+            unset($options);
+            $options[0] = get_string("no");
+            $options[1] = get_string("yes");
+
+            $glossary_enablerssfeeds = false;
+            if (isset($CFG->glossary_enablerssfeeds) && $CFG->glossary_enablerssfeeds == 1) {
+                $glossary_enablerssfeeds = true;
+            }
+
+            choose_from_menu ($options, "glossary_enablerssfeeds", $glossary_enablerssfeeds, "", "", "");
+        }
+    ?>
+    </td>
+    <td>
+    <?php
+        print_string("configenablerssfeeds","glossary");
+        if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
+            print_string("configenablerssfeedsdisabled");
+        }
+    ?>
+    </td>
+</tr>
 <tr valign=top>
     <td colspan = 3 align=center><strong><?php print_string("entryleveldefaultsettings","glossary") ?></strong></td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_linkentries:</td>
+    <td align=right>glossary_linkentries:</td>
     <td>
     <select size=1 name=glossary_linkentries>
 <?php 
@@ -148,7 +177,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_casesensitive:</td>
+    <td align=right>glossary_casesensitive:</td>
     <td>
     <select size=1 name=glossary_casesensitive>
 <?php 
@@ -169,7 +198,7 @@
     </td>
 </tr>
 <tr valign=top>
-    <td align=right><p>glossary_fullmatch:</td>
+    <td align=right>glossary_fullmatch:</td>
     <td>
     <select size=1 name=glossary_fullmatch>
 <?php 
@@ -207,7 +236,7 @@
     }
     asort($formats);
 
-    echo '<table cellpadding="5" bgcolor="#FFFFFF" class="generaltab" width="40%" align="center">';
+    print_simple_box_start('center');
     foreach ($formats as $formatid=>$formatname) {
         $recformat = get_record('glossary_formats','id',$formatid);
         echo '<tr>';
@@ -225,41 +254,12 @@
         echo '<td align="center" nowrap="nowrap">' . $eicon . '&nbsp;&nbsp;' . $vicon . '</td>';
         echo '</tr>';
     }
-    echo '</table>';
+    print_simple_box_end();
 
 ?>
 
 	</td>
 </tr>
-<tr valign=top>
-        <td align=right><p>glossary_enablerssfeeds:</td>
-        <td>
-    <?php
-        if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
-            print_string("no");
-        } else {
-            unset($options);
-            $options[0] = get_string("no");
-            $options[1] = get_string("yes");
-
-            $glossary_enablerssfeeds = false;
-            if (isset($CFG->glossary_enablerssfeeds) && $CFG->glossary_enablerssfeeds == 1) {
-                $glossary_enablerssfeeds = true;
-            }
-
-            choose_from_menu ($options, "glossary_enablerssfeeds", $glossary_enablerssfeeds, "", "", "");
-        }
-    ?>
-    </td>
-    <td>
-    <?php
-        print_string("configenablerssfeeds","glossary");
-        if (!isset($CFG->enablerssfeeds) || $CFG->enablerssfeeds == 0) {
-            print_string("configenablerssfeedsdisabled");
-        }
-    ?>
-    </td>
-</tr>
 <tr>
     <td colspan=3 align=center>
 	<input type="submit" value="<?php print_string("savechanges") ?>" /></td>
diff --git a/mod/resource/config.html b/mod/resource/config.html
index 819cf5fd747..3e760ef0113 100644
--- a/mod/resource/config.html
+++ b/mod/resource/config.html
@@ -3,7 +3,7 @@
 
 <table cellpadding="9" cellspacing="0" >
 <tr valign="top">
-	<td align="right"><p>resource_framesize:</td>
+	<td align="right">resource_framesize:</td>
 	<td>
     <input name="resource_framesize" type="text" size="5" value="<?php p($CFG->resource_framesize) ?>" />
     </td>
@@ -12,7 +12,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_websearch:</td>
+	<td align="right">resource_websearch:</td>
 	<td>
     <input name="resource_websearch" type="text" size="30" value="<?php p($CFG->resource_websearch) ?>" />
     </td>
@@ -21,7 +21,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_defaulturl:</td>
+	<td align="right">resource_defaulturl:</td>
 	<td>
     <input name="resource_defaulturl" type="text" size="30" value="<?php p($CFG->resource_defaulturl) ?>" />
     </td>
@@ -30,7 +30,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_secretphrase:</td>
+	<td align="right">resource_secretphrase:</td>
 	<td>
     <input name="resource_secretphrase" type="text" size="30" value="<?php p($CFG->resource_secretphrase) ?>" />
     </td>
@@ -39,7 +39,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_filterexternalpages:</td>
+	<td align="right">resource_filterexternalpages:</td>
 	<td>
     <?php
         unset($choices);
@@ -53,7 +53,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_popup:</td>
+	<td align="right">resource_popup:</td>
 	<td>
     <?php
         unset($choices);
@@ -69,7 +69,7 @@
 <?php foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) {
           $defaultvalue = "resource_popup$optionname";
           echo "<tr valign=\"top\">";
-	      echo "<td align=\"right\"><p>$defaultvalue:</td>";
+	      echo "<td align=\"right\">$defaultvalue:</td>";
 	      echo "<td>";
           if ($optionname == "height" or $optionname == "width") {
               echo "<input name=$defaultvalue type=\"text\" size=\"5\" value=\"".$CFG->$defaultvalue."\" />";
@@ -84,7 +84,7 @@
       }
 ?>
 <tr valign="top">
-	<td align="right"><p>resource_windowsettings:</td>
+	<td align="right">resource_windowsettings:</td>
 	<td>
     <?php
         unset($choices);
@@ -98,7 +98,7 @@
     </td>
 </tr>
 <tr valign="top">
-	<td align="right"><p>resource_parametersettings:</td>
+	<td align="right">resource_parametersettings:</td>
 	<td>
     <?php
         unset($choices);
diff --git a/mod/scorm/config.html b/mod/scorm/config.html
index 34f2a3815b1..817f296177c 100755
--- a/mod/scorm/config.html
+++ b/mod/scorm/config.html
@@ -3,7 +3,7 @@
 
 <table cellpadding="9" cellspacing="0" >
 <tr valign="top">
-    <td align="right"><p>scorm_validate:</td>
+    <td align="right">scorm_validate:</td>
     <td>
     <?php
         unset($choices);
@@ -22,7 +22,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>scorm_framesize:</td>
+    <td align="right">scorm_framesize:</td>
     <td>
     	<input name="scorm_framesize" type="text" size="5" value="<?php p($CFG->scorm_framesize) ?>" />
     </td>
@@ -31,7 +31,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><p>scorm_popup:</td>
+    <td align="right">scorm_popup:</td>
     <td>
     <?php
         unset($choices);
@@ -47,7 +47,7 @@
 <?php foreach ($SCORM_WINDOW_OPTIONS as $optionname) {
           $defaultvalue = "scorm_popup$optionname";
           echo "<tr valign=\"top\">";
-	      echo "<td align=\"right\"><p>$defaultvalue:</td>";
+	      echo "<td align=\"right\">$defaultvalue:</td>";
 	      echo "<td>";
           if ($optionname == "height" or $optionname == "width") {
               echo "<input name=$defaultvalue type=\"text\" size=\"5\" value=\"".$CFG->$defaultvalue."\" />";