diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 5ba749ad5f2..204baaddd22 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -164,8 +164,9 @@
     $strediting = get_string(isset($modform->instance) ? "editingquiz"
                                                        : "editquestions",
                              "quiz");
+    $strheading = empty($modform->name) ? $strediting : $modform->name;
 
-    print_header("$course->shortname: $strediting", "$course->shortname: $strediting",
+    print_header("$course->shortname: $strediting", "$course->shortname: $strheading",
                  "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> ".
                  "<a href=\"$CFG->wwwroot/mod/quiz/index.php?id=$course->id\">$strquizzes</a> -> $strediting");
 
diff --git a/mod/quiz/import.php b/mod/quiz/import.php
index 02d6dc5df76..ba5a2a34a3e 100644
--- a/mod/quiz/import.php
+++ b/mod/quiz/import.php
@@ -21,15 +21,16 @@
         error("Only the teacher can import quiz questions!");
     }
 
-    $streditingquiz = get_string(isset($modform->instance) ? "editingquiz"
-                                                           : "editquestions",
-                                 "quiz");
     $strimportquestions = get_string("importquestions", "quiz");
     $strquestions = get_string("questions", "quiz");
 
+    $strquizzes = get_string('modulenameplural', 'quiz');
+    $streditingquiz = get_string(isset($SESSION->modform->instance) ? "editingquiz" : "editquestions", "quiz");
+
     print_header("$course->shortname: $strimportquestions", "$course->shortname: $strimportquestions",
-                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
-                  -> <A HREF=\"edit.php\">$streditingquiz</A> -> $strimportquestions");
+                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ".
+                 "-> <a href=\"$CFG->wwwroot/mod/quiz/index.php?id=$course->id\">$strquizzes</a>".
+                  " -> <a href=\"edit.php\">$streditingquiz</a> -> $strimportquestions");
 
     if ($form = data_submitted()) {   /// Filename
 
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 975bdf9f23a..a4376aa767a 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -50,6 +50,10 @@ function quiz_add_instance($quiz) {
 /// will create a new instance and return the id number 
 /// of the new instance.
 
+    global $SESSION;
+
+    unset($SESSION->modform);
+
     $quiz->created      = time();
     $quiz->timemodified = time();
     $quiz->timeopen = make_timestamp($quiz->openyear, $quiz->openmonth, $quiz->openday, 
@@ -101,6 +105,10 @@ function quiz_update_instance($quiz) {
 /// (defined by the form in mod.html) this function 
 /// will update an existing instance with new data.
 
+    global $SESSION;
+
+    unset($SESSION->modform);
+
     $quiz->timemodified = time();
     $quiz->timeopen = make_timestamp($quiz->openyear, $quiz->openmonth, $quiz->openday, 
                                      $quiz->openhour, $quiz->openminute, 0);
diff --git a/mod/quiz/multiple.php b/mod/quiz/multiple.php
index 9a4e5feb10c..fb00b03a79f 100644
--- a/mod/quiz/multiple.php
+++ b/mod/quiz/multiple.php
@@ -96,15 +96,14 @@
     $strcancel = get_string("cancel");
     $strsavechanges = get_string("savechanges");
     $strbacktoquiz = get_string("backtoquiz", "quiz");
-
-    $streditingquiz = get_string(isset($modform->instance) ? "editingquiz"
-                                                           : "editquestions",
-                                 "quiz");
+    $strquizzes = get_string('modulenameplural', 'quiz');
+    $streditingquiz = get_string(isset($SESSION->modform->instance) ? "editingquiz" : "editquestions", "quiz");
     $strcreatemultiple = get_string("createmultiple", "quiz");
 
     print_header("$course->shortname: $strcreatemultiple", "$course->shortname: $strcreatemultiple",
-                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
-                   -> <A HREF=\"edit.php\">$streditingquiz</A> -> $strcreatemultiple");
+                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ".
+                 " -> <a href=\"$CFG->wwwroot/mod/quiz/index.php?id=$course->id\">$strquizzes</a>".
+                 " -> <a href=\"edit.php\">$streditingquiz</a> -> $strcreatemultiple");
 
 
     print_heading_with_help($strcreatemultiple, "createmultiple", "quiz");
diff --git a/mod/quiz/question.php b/mod/quiz/question.php
index 59d53379a6b..66757dda4f1 100644
--- a/mod/quiz/question.php
+++ b/mod/quiz/question.php
@@ -48,14 +48,14 @@
         error("You can't modify these questions!");
     }
 
-    $streditingquiz = get_string(isset($modform->instance) ? "editingquiz"
-                                                           : "editquestions",
-                                 "quiz");
+    $strquizzes = get_string('modulenameplural', 'quiz');
+    $streditingquiz = get_string(isset($SESSION->modform->instance) ? "editingquiz" : "editquestions", "quiz");
     $streditingquestion = get_string("editingquestion", "quiz");
 
     print_header("$course->shortname: $streditingquestion", "$course->shortname: $streditingquestion",
-                 "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> 
-                  -> <A HREF=\"edit.php\">$streditingquiz</A> -> $streditingquestion");
+                 "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ".
+                 "-> <a href=\"$CFG->wwwroot/mod/quiz/index.php?id=$course->id\">$strquizzes</a>".
+                  " -> <a href=\"edit.php\">$streditingquiz</a> -> $streditingquestion");
 
     if (isset($delete)) {
         if (isset($confirm)) {