diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
index f25b829278d..3f3fe13fa21 100644
--- a/mod/lesson/action/addbranchtable.php
+++ b/mod/lesson/action/addbranchtable.php
@@ -36,13 +36,13 @@
     // give teacher a blank proforma
     print_heading_with_help(get_string("addabranchtable", "lesson"), "overview", "lesson");
     ?>
-    <form name="form" method="post" action="lesson.php" />
+    <form name="form" method="post" action="lesson.php">
     <input type="hidden" name="id" value="<?PHP echo $cm->id ?>" />
-    <input type="hidden" name="action" value="insertpage">
+    <input type="hidden" name="action" value="insertpage" />
     <input type="hidden" name="pageid" value="<?PHP echo $pageid ?>" />
     <input type="hidden" name="qtype" value="<?PHP echo LESSON_BRANCHTABLE ?>" />
     <input type="hidden" name="sesskey" value="<?PHP echo $USER->sesskey ?>" />
-    <center><table class="generalbox" cellpadding=5 border=1>
+    <center><table class="generalbox" cellpadding="5" border="1">
     <tr valign="top">
     <td><b><label for="title"><?php print_string("pagetitle", "lesson"); ?>:</label></b><br />
     <input type="text" id="title" name="title" size="80" maxsize="255" value="" /></td></tr>
@@ -55,7 +55,7 @@
     echo "<tr><td>\n";
     echo "<center><input name=\"layout\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
     echo get_string("arrangebuttonshorizontally", "lesson")."\n";
-    echo "<br><input name=\"display\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
+    echo "<br /><input name=\"display\" type=\"checkbox\" value=\"1\" checked=\"checked\" />";
     echo get_string("displayinleftmenu", "lesson");
     echo "</center>\n";
     echo "</td></tr>\n";
@@ -64,7 +64,7 @@
         echo "<tr><td><b>".get_string("description", "lesson")." $iplus1:</b><br />\n";
         print_textarea(false, 10, 70, 630, 300, "answer[$i]");  // made the default set to off also removed use_html_editor(); line from down below, which made all textareas turn into html editors
         echo "</td></tr>\n";
-        echo "<tr><td><B>".get_string("jump", "lesson")." $iplus1:</b> \n";
+        echo "<tr><td><b>".get_string("jump", "lesson")." $iplus1:</b> \n";
         if ($i) {
             // answers 2, 3, 4... jumpto this page
             choose_from_menu($jump, "jumpto[$i]", 0, "");
diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php
index a342a513f7f..51746beb298 100644
--- a/mod/lesson/edit.php
+++ b/mod/lesson/edit.php
@@ -275,13 +275,15 @@
                     }
                     
                     if (count($pages) == 1) {
+                        echo "</td></tr>";
                         break;
                     }
                     
                     $prevpageid = $page->id;
                     $pageid = $page->nextpageid;
+                    echo "</td></tr>";
                 }
-                echo "</table>";
+                echo "</td></tr></table>";
                 break;
         }
     } 
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 26d72f171cf..13e78d1e322 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -480,7 +480,7 @@ function lesson_print_page_actions($cmid, $page, $printmove, $printaddpage = fal
     
     if (has_capability('mod/lesson:edit', $context)) {
         if ($printmove) {
-            $actions[] = "<a title=\"".get_string('move')."\" href=\"$CFG->wwwroot/mod/lesson/lesson.php?id=$cmid&action=move&pageid=$page->id\">
+            $actions[] = "<a title=\"".get_string('move')."\" href=\"$CFG->wwwroot/mod/lesson/lesson.php?id=$cmid&amp;action=move&amp;pageid=$page->id\">
                           <img src=\"$CFG->pixpath/t/move.gif\" height=\"11\" width=\"11\" alt=\"".get_string('move')."\" border=\"0\" /></a>\n";
         }
         $actions[] = "<a title=\"".get_string('update')."\" href=\"$CFG->wwwroot/mod/lesson/lesson.php?id=$cmid&amp;action=editpage&amp;pageid=$page->id\">