diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index d6da1beb18d..4ec6f8af29f 100644
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -1,15 +1,15 @@
 <?php
 $logurl = $CFG->wwwroot.
-          '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id.
-          '%2F1&user='.'0'.
-          '&date=0'.
-          '&modid=&modaction=0&logformat=showashtml';
+          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
+          '%2F1&amp;user='.'0'.
+          '&amp;date=0'.
+          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
 
 admin_externalpage_print_header($adminroot);
 
 if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
-    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-    $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+    $tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
     $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
 } else {
     $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
@@ -26,18 +26,18 @@ print_simple_box_start("center", "");
 <table cellpadding="9" cellspacing="0" width="635">
 
 <tr>
-    <td align="right" valign="top" nowrap><?php print_string('site'); ?>:</td>
+    <td align="right" valign="top"><?php print_string('site'); ?>:</td>
     <td valign="top"><input type="text" name="name" size="30" value="<?php echo $mnet_peer->name; ?>" /></td>
 </tr>
 <tr>
-    <td align="right" valign="top" nowrap><?php print_string('hostname', 'mnet'); ?>:</td>
+    <td align="right" valign="top"><?php print_string('hostname', 'mnet'); ?>:</td>
     <td valign="top"><input type="text" name="wwwroot" size="30" value="<?php echo $mnet_peer->wwwroot; ?>" /></td>
 </tr>
 <?php
 if (empty($mnet_peer->public_key)) $mnet_peer->public_key = '';
 ?>
 <tr>
-    <td align="right" valign="top" nowrap><?php
+    <td align="right" valign="top"><?php
         print_string('publickey', 'mnet');
         echo ': <br />';
         helpbutton("publickey", get_string('publickey', 'mnet'), "mnet", true, true);
@@ -56,7 +56,7 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
         if (empty($mnet_peer->public_key)) {
             print_string('nopubkey', 'mnet');
         }
-        ?><br>
+        ?><br />
         <textarea rows="17" cols="65" name="public_key" style="font-size: 8px;"><?php echo $mnet_peer->public_key; ?></textarea>
     </td>
 </tr>
@@ -65,11 +65,11 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
 if(!empty($currentkey)):
 ?>
     <tr>
-        <td align="right" valign="top" nowrap></td>
+        <td align="right" valign="top"></td>
         <td valign="top"><?php print_string('keymismatch', 'mnet'); ?></td>
     </tr>
     <tr>
-        <td align="right" valign="top" nowrap><?php print_string('currentkey', 'mnet'); ?>:</td>
+        <td align="right" valign="top"><?php print_string('currentkey', 'mnet'); ?>:</td>
         <td valign="top"><pre style="font-size: 8px;"><?php echo $currentkey;?></pre></td>
     </tr>
 <?php
@@ -78,7 +78,7 @@ endif;
 if (isset($mnet_peer->id) && $mnet_peer->id > 0):
 ?>
     <tr>
-        <td align="right" valign="top" nowrap><?php print_string('last_connect_time', 'mnet'); ?>:</td>
+        <td align="right" valign="top"><?php print_string('last_connect_time', 'mnet'); ?>:</td>
         <td valign="top"><?php echo ($mnet_peer->last_connect_time == 0)? get_string('never','mnet') : date('H:i:s d/m/Y',$mnet_peer->last_connect_time);?></td>
     </tr>
 <?php
@@ -87,7 +87,7 @@ endif;
 if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0):
 ?>
     <tr>
-        <td align="right" valign="top" nowrap><?php print_string('deleted'); ?>:</td>
+        <td align="right" valign="top"><?php print_string('deleted'); ?>:</td>
         <td valign="top">
             <input type="radio" name="deleted" value="0" checked="true" /> <?php print_string('reenableserver','mnet'); ?><br />
             <input type="radio" name="deleted" value="1"  /> <?php print_string('yes'); ?><br />
@@ -99,7 +99,7 @@ endif;
 if (isset($mnet_peer->ip_address) && '' != $mnet_peer->ip_address):
 ?>
     <tr>
-        <td align="right" valign="top" nowrap><?php print_string('ipaddress', 'mnet');
+        <td align="right" valign="top"><?php print_string('ipaddress', 'mnet');
         echo ': <br />';
         helpbutton("ipaddress", get_string('ipaddress', 'mnet'), "mnet", true, true);
         ?>:</td>
@@ -114,6 +114,7 @@ endif;
     <td><input type="submit" value="<?php print_string("savechanges"); ?>" /></td>
 </tr>
 </table>
+</form>
 <?php
 print_simple_box_end();
 admin_externalpage_print_footer($adminroot);
diff --git a/admin/mnet/mnet_services.html b/admin/mnet/mnet_services.html
index b1550459e2b..6f714b7ada9 100644
--- a/admin/mnet/mnet_services.html
+++ b/admin/mnet/mnet_services.html
@@ -2,13 +2,13 @@
 admin_externalpage_print_header($adminroot);
 
 $logurl = $CFG->wwwroot.
-          '/course/report/log/index.php?chooselog=1&showusers=1&showcourses=1&host_course='.$mnet_peer->id.
-          '%2F1&user='.'0'.
-          '&date=0'.
-          '&modid=&modaction=0&logformat=showashtml';
+          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
+          '%2F1&amp;user='.'0'.
+          '&amp;date=0'.
+          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
 
-$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
-$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+$tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
+$tabs[] = new tabobject('mnetservices', 'mnet_services.php?step=list&amp;hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
 if ($mnet_peer->id != $CFG->mnet_all_hosts_id) $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
 print_tabs(array($tabs), 'mnetservices');
 print_simple_box_start("center", "");
@@ -40,8 +40,8 @@ print_simple_box_start("center", "");
             echo $breakstring;
 ?>
     <input type="hidden" name="exists[<?php echo  $version['serviceid']; ?>]" value="1" />
-    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked ': '' ; ?>/><?php print_string('publish','mnet'); ?><?php echo $versionstring; if (!empty($version['hostsubscribes'])) echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish']));  ?><br />
-    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked ': '' ; ?>/><?php print_string('subscribe','mnet'); ?><?php echo $versionstring; if (!empty($version['hostpublishes'])) echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?><br />
+    <input type="checkbox" name="publish[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_publish']))? 'checked="checked" ': '' ; ?>/><?php print_string('publish','mnet'); ?><?php echo $versionstring; if (!empty($version['hostsubscribes'])) echo '<a href="#" title="'.get_string('issubscribed','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_publish'])) print_string("enabled_for_all",'mnet',!empty($version['I_publish']));  ?><br />
+    <input type="checkbox" name="subscribe[<?php echo $version['serviceid']; ?>]" <?php echo (!empty($version['I_subscribe']))? 'checked="checked" ': '' ; ?>/><?php print_string('subscribe','mnet'); ?><?php echo $versionstring; if (!empty($version['hostpublishes'])) echo '<a href="#" title="'.get_string('ispublished','mnet', $mnet_peer->name).'">&radic;</a> '; if (!empty($version['allhosts_subscribe'])) print_string("enabled_for_all",'mnet',!empty($version['I_subscribe'])); ?><br />
 <?php
             $breakstring = '. . . . . . . . . . . . . . . . . . . . . . . . <br>';
         endforeach;
@@ -69,16 +69,9 @@ print_simple_box_start("center", "");
     <div id="formElements"><input type="hidden" name="outer" value="4" /></div>
     </td>
 </tr>
-<?php
-
-echo '
-    </table>
-';
-print_simple_box_end();
-print_simple_box_end();
-
-echo '
+</table>
 </form>
-';
+<?php
+print_simple_box_end();
 admin_externalpage_print_footer($adminroot);
 ?>
diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index e5e8b2a5b87..5578f8b4160 100644
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -13,7 +13,7 @@ admin_externalpage_print_header($adminroot);
         <td class="cell c1" colspan="2"><?php print_string('registerallhostsexplain', 'mnet'); ?></td>
     </tr>
     <tr>
-        <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked '; ?>/></td>
+        <td class="cell c1"><input type="checkbox" name="registerallhosts" <?php if (!empty($CFG->mnet_register_allhosts)) echo 'checked="checked" '; ?>/></td>
         <td class="cell c1"> <?php print_string('registerallhosts', 'mnet'); ?> </td>
     </tr>
     <tr>
diff --git a/lib/weblib.php b/lib/weblib.php
index 8f2841f5c83..1b39c38a951 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2898,13 +2898,13 @@ function print_continue($link, $return=false) {
  * Replaces print_simple_box (see deprecatedlib.php)
  *
  * @param string $message, the content of the box
- * @param string $classes, space-separated class names.
- * @param string $ids, space-separated id names.
+ * @param string $class, space-separated class names.
+ * @param string $id, space-separated id names.
  * @param boolean $return, return as string or just print it
  */
-function print_box($message, $classes='generalbox', $ids='', $return=false) {
+function print_box($message, $class='generalbox', $id='', $return=false) {
 
-    $output  = print_box_start($classes, $ids, true);
+    $output  = print_box_start($class, $id, true);
     $output .= stripslashes_safe($message);
     $output .= print_box_end(true);
 
@@ -2919,18 +2919,20 @@ function print_box($message, $classes='generalbox', $ids='', $return=false) {
  * Starts a box using divs
  * Replaces print_simple_box_start (see deprecatedlib.php)
  *
- * @param string $classes, space-separated class names.
- * @param string $ids, space-separated id names.
+ * @param string $class, space-separated class names.
+ * @param string $id, space-separated id names.
  * @param boolean $return, return as string or just print it
  */
-function print_box_start($classes='generalbox', $ids='', $return=false) {
+function print_box_start($class='generalbox', $id='', $return=false) {
     $output = '';
 
-    if ($ids) {
-        $ids = ' id="'.$ids.'"';
+    $divclasses = $class.' '.$class.'content';
+
+    if ($id) {
+        $id = ' id="'.$id.'"';
     }
 
-    $output .= '<div'.$ids.' class="'.$classes.'">';
+    $output .= '<div'.$id.' class="'.$divclasses.'">';
 
     if ($return) {
         return $output;
@@ -4933,9 +4935,7 @@ function redirect($url, $message='', $delay=-1) {
 //]]>
 </script>
 <?php
-    echo '</div> <!-- End content div -->';
-    echo '</body>';
-    echo '</html>';
+    print_footer();
     die;
 }