diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index eed158eddc8..ee875ea9550 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -168,11 +168,9 @@ function assignment_user_complete($course, $user, $mod, $assignment) {
         }
 
         print_simple_box_start();
-        echo "<p><font size=1>";
         echo get_string("lastmodified").": ";
         echo userdate($submission->timemodified);
         echo assignment_print_difference($assignment->timedue - $submission->timemodified);
-        echo "</font></p>";
 
         assignment_print_user_files($assignment, $user);
 
@@ -321,10 +319,10 @@ function assignment_print_recent_activity($course, $isteacher, $timestart) {
         print_headline(get_string("newsubmissions", "assignment").":");
         foreach ($assignments as $assignment) {
             $date = userdate($assignment->time, $strftimerecent);
-            echo "<p><font size=1>$date - ".fullname($assignment)."<br />";
+            echo "$date - ".fullname($assignment)."<br />";
             echo "\"<a href=\"$CFG->wwwroot/mod/assignment/$assignment->url\">";
             echo "$assignment->name";
-            echo "</a>\"</font></p>";
+            echo '</a>"';
         }
     }
  
@@ -543,16 +541,15 @@ function assignment_print_submission($assignment, $user, $submission, $teachers,
     if ($assignment->type == OFFLINE) {
         echo "\n<td bgcolor=\"$THEME->body\" width=\"35\" valign=\"top\">";
     } else {
-        echo "\n<td rowspan=\"2\" bgcolor=\"$THEME->body\" width=\"35\" valign\"top\">";
+        echo "\n<td rowspan=\"2\" bgcolor=\"$THEME->body\" width=\"35\" valign=\"top\">";
     }
     print_user_picture($user->id, $assignment->course, $user->picture);
     echo "</td>";
     echo "<td nowrap=\"nowrap\" bgcolor=\"$THEME->cellheading\">".fullname($user, true);
     if ($assignment->type != OFFLINE and $submission->timemodified) {
-        echo "&nbsp;&nbsp;<font SIZE=1>".get_string("lastmodified").": ";
+        echo "&nbsp;&nbsp;".get_string("lastmodified").": ";
         echo userdate($submission->timemodified);
         echo assignment_print_difference($assignment->timedue - $submission->timemodified);
-        echo "</font>";
     }
     echo "</td>\n";
     echo "</tr>";
@@ -585,7 +582,7 @@ function assignment_print_submission($assignment, $user, $submission, $teachers,
     echo get_string("feedback", "assignment").":";
     choose_from_menu($grades, "g$submission->id", $submission->grade, get_string("nograde"));
     if ($submission->timemarked) {
-        echo "&nbsp;&nbsp;<font size=1>".userdate($submission->timemarked)."</font>";
+        echo "&nbsp;&nbsp;".userdate($submission->timemarked);
     }
     echo "<br /><textarea name=\"c$submission->id\" rows=\"6\" cols=\"60\">";
     p($submission->comment);
@@ -648,7 +645,7 @@ function assignment_print_user_files($assignment, $user) {
                     $ffurl = "file.php?file=/$filearea/$file";
                 }
 
-                echo "<img src=\"$CFG->pixpath/f/$icon\" height=16 width=16 border=0 alt=\"file\">";
+                echo "<img src=\"$CFG->pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />";
                 echo "&nbsp;<a target=\"uploadedfile\" href=\"$CFG->wwwroot/$ffurl\">$file</a>";
                 echo "<br />";
             }
@@ -678,14 +675,14 @@ function assignment_print_upload_form($assignment) {
 
     global $CFG;
 
-    echo "<div align=CENTER>";
-    echo "<form enctype=\"multipart/form-data\" method=\"POST\" action=\"upload.php?id=$assignment->id\">";
-    echo " <input type=hidden name=id value=\"$assignment->id\" />";
+    echo '<center>';
+    echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"upload.php?id=$assignment->id\">";
+    echo '<input type="hidden" name="id" value="'.$assignment->id.'" />';
     require_once($CFG->dirroot.'/lib/uploadlib.php');
     upload_print_form_fragment(1,array('newfile'),false,null,0,$assignment->maxbytes,false);
-    echo " <input type=submit name=save value=\"".get_string("uploadthisfile")."\" />";
-    echo "</form>";
-    echo "</div>";
+    echo '<input type="submit" name="save" value="'.get_string('uploadthisfile').'" />';
+    echo '</form>';
+    echo '</center>';
 }
 
 function assignment_get_recent_mod_activity(&$activities, &$index, $sincetime, $courseid, $assignment="0", $user="", $groupid="")  {
diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html
index 3f48b5a0e0e..4ae39a12ed9 100644
--- a/mod/assignment/mod.html
+++ b/mod/assignment/mod.html
@@ -37,7 +37,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b><?php print_string('description', 'assignment') ?>:</b><br />
+    <td align="right"><b><?php print_string('description', 'assignment') ?>:</b><br /><br />
      <?php
         helpbutton('writing', get_string('helpwriting'), 'moodle', true, true);
         echo '<br />';
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index eee97730755..351c14f39e9 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -116,7 +116,7 @@
                 print_heading(get_string("notsubmittedyet","assignment"));
             }
         
-            echo "<hr size=1 noshade>";
+            echo '<hr size="1" noshade="noshade" />';
         
             if ($submission and $submission->timemarked) {
                 print_heading(get_string("submissionfeedback", "assignment").":", "center");
diff --git a/mod/chat/mod.html b/mod/chat/mod.html
index 34d10732ea3..2cd53749a35 100644
--- a/mod/chat/mod.html
+++ b/mod/chat/mod.html
@@ -27,13 +27,14 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b><?php print_string("chatintro", "chat")?>:</b><br />
+    <td align="right"><b><?php print_string("chatintro", "chat")?>:</b><br /><br />
      <?php
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
         echo "<br />";
         helpbutton("questions", get_string("helpquestions"), "moodle", true, true);
         echo "<br />";
         emoticonhelpbutton("form", "intro");
+        echo "<br />";
       ?>
     </td>
     <td>
diff --git a/mod/choice/mod.html b/mod/choice/mod.html
index b4fab5289ac..22cd88864b9 100644
--- a/mod/choice/mod.html
+++ b/mod/choice/mod.html
@@ -61,7 +61,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"><b><?php print_string("choicetext","choice") ?>:</b><br />
+    <td align="right"><b><?php print_string("choicetext","choice") ?>:</b><br /><br />
      <?php
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
         echo "<br />";
@@ -72,6 +72,7 @@
         } else {
            emoticonhelpbutton("form", "text");
         }   
+        echo "<br />";
       ?>
     </td>
     <td>
diff --git a/mod/forum/mod.html b/mod/forum/mod.html
index eb4d30f5652..b4afea9e690 100644
--- a/mod/forum/mod.html
+++ b/mod/forum/mod.html
@@ -72,7 +72,7 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b><?php print_string('forumintro', 'forum')?>:</b><br />
+    <td align="right"><b><?php print_string('forumintro', 'forum')?>:</b><br /><br />
      <?php
         helpbutton('writing', get_string('helpwriting'), 'moodle', true, true);
         echo '<br />';
@@ -83,6 +83,7 @@
         } else {
            emoticonhelpbutton('form', 'intro');
         }   
+        echo '<br />';
       ?>
     </td>
     <td>
diff --git a/mod/forum/post.html b/mod/forum/post.html
index e128ea240d6..f0cb95f000e 100644
--- a/mod/forum/post.html
+++ b/mod/forum/post.html
@@ -7,17 +7,9 @@
     </td>
 </tr>
 <tr valign="top">
-    <td align="right"><b>
-     <?php print_string("message", "forum"); ?>:
-     </b></td>
-    <td align="left" rowspan="2">
-    <?php print_textarea($usehtmleditor, 25, 65, 630, 400, "message", $post->message); ?>
-    </td>
-</tr>
-<tr valign="top">
-    <td align="right" valign="middle" nowrap="nowrap">
-
-     <?php
+    <td align="right"><b><?php print_string("message", "forum"); ?>:</b>
+    <br /><br />
+      <?php
         helpbutton("reading", get_string("helpreading"), "moodle", true, true);
         echo "<br />";
         helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
@@ -29,14 +21,14 @@
         } else {
            emoticonhelpbutton("theform", "message");
         } 
+        echo "<br />";
       ?>
-     <br />
-
+    </td>
+    <td align="left">
+    <?php print_textarea($usehtmleditor, 25, 65, 630, 400, "message", $post->message); ?>
     </td>
 </tr>
 
-
-
 <tr valign="top">
     <td align="right"><b><?php print_string("formattexttype"); ?>:</b></td>
     <td>
@@ -90,7 +82,8 @@
     <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $maxbytes ?>" />
     <input type="file" name="attachment" size="40" alt="<?php print_string("attachment", "forum") ?>" />
     <?php
-    helpbutton("attachment", get_string("attachment", "forum"), "forum"); 
+    helpbutton("attachment", get_string("attachment", "forum"), "forum");
+    echo '&nbsp;';
     print_string("maxsize", "", display_size($maxbytes)); 
     ?>
     </td>
diff --git a/mod/forum/prune.html b/mod/forum/prune.html
index 0a59f0aa9de..c8bb3fafdff 100644
--- a/mod/forum/prune.html
+++ b/mod/forum/prune.html
@@ -1,7 +1,7 @@
 <form name="prune" method="get" action="post.php" enctype="multipart/form-data">
 <table border="0" cellpadding="5">
 <tr valign="top">
-    <td align="right"><p><b><?php print_string("discussionname", "forum"); ?>:</b></p></td>
+    <td align="right"><b><?php print_string("discussionname", "forum"); ?>:</b></td>
     <td>
         <input type="text" name="name" size="60" value="<?php p($post->subject) ?>" />
     </td>
@@ -10,8 +10,8 @@
 
 <tr>
     <td align="center" colspan="2">
-    <input type="hidden" name="prune"       value="<?php p($prune) ?>" />
-    <input type="hidden" name="confirm"       value="<?php p($prune) ?>" />
+    <input type="hidden" name="prune"   value="<?php p($prune) ?>" />
+    <input type="hidden" name="confirm" value="<?php p($prune) ?>" />
     <input type="submit" value="<?php print_string('prune', 'forum'); ?>" />
     </td>
 
diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index bd0baea6c98..cc793008992 100644
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -80,7 +80,6 @@ if (!isset($form->assesstimefinish)) {
 </tr>
 <tr valign="top">
     <td align="right"><b><?php print_string("description") ?>:</b><br />
-     <font size="1">
      <?php
         helpbutton("description", get_string("description"), "glossary", true, true);
         echo "<br />";
@@ -88,8 +87,6 @@ if (!isset($form->assesstimefinish)) {
         echo "<br />";
         helpbutton("text", get_string("helptext"), "moodle", true, true);
      ?>
-     <br />
-     </font>
     </td>
     <td align="left">
         <?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index 6853ca59abb..9d8895c6259 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -134,9 +134,7 @@
 </tr>
 
 <tr valign="top">
-    <td align="right"><b><?php print_string("introduction", "quiz") ?>:</b>
-      <br />
-      <span class="editorhelptext">
+    <td align="right"><b><?php print_string("introduction", "quiz") ?>:</b><br /><br />
      <?php
         if ($usehtmleditor) {
            helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
@@ -147,8 +145,6 @@
            echo '<br />';
         } 
       ?>
-      <br />
-      </span>
     </td>
     <td>
         <?php