mod/lesson/lib.php    |   15 ++++++++++-----
 mod/lesson/report.php |    6 +++---
 mod/lesson/view.php   |    1 -
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index 77015f9..56a244a 100644
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -771,15 +771,20 @@ function lesson_extend_settings_navigation($settings, $lessonnode) {
 
     if ($canedit) {
         $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);
+            $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)) {
-        $reportsnode = $lessonnode->add(get_string('reports', 'lesson'));
         $url = new moodle_url('/mod/lesson/report.php', array('id'=>$PAGE->cm->id, 'action'=>'reportoverview'));
-        $reportsnode->add(get_string('overview', 'lesson'), $url);
-        $url = new moodle_url('/mod/lesson/report.php', array('id'=>$PAGE->cm->id, 'action'=>'reportdetail'));
-        $reportsnode->add(get_string('detailedstats', 'lesson'), $url);
+        $reportsnode = $lessonnode->add(get_string('reports', 'lesson'), $url);
+            $url = new moodle_url('/mod/lesson/report.php', array('id'=>$PAGE->cm->id, 'action'=>'reportoverview'));
+            $reportsnode->add(get_string('overview', 'lesson'), $url);
+            $url = new moodle_url('/mod/lesson/report.php', array('id'=>$PAGE->cm->id, 'action'=>'reportdetail'));
+            $reportsnode->add(get_string('detailedstats', 'lesson'), $url);
     }
 
     if ($canedit) {
diff --git a/mod/lesson/report.php b/mod/lesson/report.php
index 14c013e..53e00cd 100644
--- a/mod/lesson/report.php
+++ b/mod/lesson/report.php
@@ -70,9 +70,9 @@ 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 c4dc634..2eb7b74 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -345,7 +345,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;