diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 7bab80f8d5c..c8503423d3d 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -777,8 +777,11 @@ function lesson_extend_settings_navigation($settings, $lessonnode) {
     $lessonnode->add(get_string('preview', 'lesson'), $url);
 
     if (has_capability('mod/lesson:edit', $PAGE->cm->context)) {
-        $url = new moodle_url('/mod/lesson/edit.php', array('id'=>$PAGE->cm->id));
-        $lessonnode->add(get_string('edit', 'lesson'), $url);
+        $editnode = $lessonnode->add(get_string('edit', 'lesson'));
+        $url = new moodle_url('/mod/lesson/edit.php', array('id' => $PAGE->cm->id, 'mode' => 'collapsed'));
+        $editnode->add(get_string('collapsed', 'lesson'), $url);
+        $url = new moodle_url('/mod/lesson/edit.php', array('id' => $PAGE->cm->id, 'mode' => 'full'));
+        $editnode->add(get_string('full', 'lesson'), $url);
     }
 
     if (has_capability('mod/lesson:manage', $PAGE->cm->context)) {
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index 80ecc390ac4..42c3d3cd23a 100644
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -69,9 +69,7 @@ if (! $students = $DB->get_records_sql($sql, $params)) {
 }
 
 $url = new moodle_url('/mod/lesson/report.php', array('id'=>$id));
-if ($action !== 'reportoverview') {
-    $url->param('action', $action);
-}
+$url->param('action', $action);
 if ($pageid !== null) {
     $url->param('pageid', $pageid);
 }
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index ec46e64b918..08feb86b253 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -353,7 +353,6 @@ if ($pageid != LESSON_EOL) {
         }
     }
 
-    $PAGE->set_url('/mod/lesson/view.php', array('id' => $cm->id, 'pageid' => $page->id));
     $PAGE->set_subpage($page->id);
     $currenttab = 'view';
     $extraeditbuttons = true;