diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index d2f8703a1f1..5a79c00d78c 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -66,6 +66,7 @@ $strfeedbacks = get_string("modulenameplural", "feedback");
 $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add(get_string('analysis','feedback'));
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index e0ad4ff2f8e..85e20686a35 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -72,7 +72,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 3c4edef2268..1424a0d4838 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -127,6 +127,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add(get_string('feedback:complete', 'feedback'));
 $PAGE->set_url('/mod/feedback/complete.php', array('id'=>$cm->id, 'gopage'=>$gopage, 'courseid'=>$course->id));
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 0c2ad759885..d66e572097b 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -138,7 +138,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index d3a216ea51d..86d6cbc3ca4 100644
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -78,7 +78,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index 45ab8d0e2f1..ec8efec1559 100644
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -59,7 +59,7 @@
 
     $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
     $PAGE->navbar->add(format_string($feedback->name));
-
+    $PAGE->set_heading(format_string($course->fullname));
     $PAGE->set_title(format_string($feedback->name));
     echo $OUTPUT->header();
 
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index 90648f00a5e..c6c263d0b57 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -87,7 +87,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index ca5293ae34e..d86b5f13527 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -152,6 +152,7 @@ if ($do_show == 'edit') {
     $PAGE->navbar->add(get_string($do_show, 'feedback'));
 }
 $PAGE->set_url('/mod/feedback/edit.php', array('id'=>$cm->id, 'do_show'=>$do_show));
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 15bcc7e9150..1c98d7bf5fc 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -106,7 +106,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 /// print the tabs
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index bcf01e259e7..d74f92104f1 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -95,7 +95,7 @@
 
     $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
     $PAGE->navbar->add(format_string($feedback->name));
-
+    $PAGE->set_heading(format_string($course->fullname));
     $PAGE->set_title(format_string($feedback->name));
     echo $OUTPUT->header();
     
diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index 710517eed25..1e9ab624bab 100644
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -36,6 +36,7 @@ $strfeedbacks = get_string("modulenameplural", "feedback");
 $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks);
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(get_string('modulename', 'feedback').' '.get_string('activities'));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 92f45acc995..48c84226632 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -74,7 +74,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 355c6300d63..0bf6065182b 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -73,6 +73,7 @@ $strfeedbacks = get_string("modulenameplural", "feedback");
 $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add(get_string('show_entries','feedback'));
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 5bb86c4851a..84aae5f9ac6 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -55,7 +55,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index f7c82393c2a..85b776005b8 100644
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -70,7 +70,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->navbar->add($strfeedbacks, new moodle_url('/mod/feedback/index.php', array('id'=>$course->id)));
 $PAGE->navbar->add(format_string($feedback->name));
-
+$PAGE->set_heading(format_string($course->fullname));
 $PAGE->set_title(format_string($feedback->name));
 echo $OUTPUT->header();
 
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index f2c2ad957d7..f7f695fac26 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -92,6 +92,7 @@ $strfeedback  = get_string("modulename", "feedback");
 
 $PAGE->set_url('/mod/feedback/view.php', array('id'=>$cm->id, 'do_show'=>'view'));
 $PAGE->set_title(format_string($feedback->name));
+$PAGE->set_heading(format_string($course->fullname));
 echo $OUTPUT->header();
 
 //ishidden check.
@@ -182,10 +183,12 @@ if(has_capability('mod/feedback:mapcourse', $context)) {
         echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthwide');
         echo '<div class="mdl-align">';
         echo '<form action="mapcourse.php" method="get">';
+        echo '<fieldset>';
         echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<input type="hidden" name="id" value="'.$id.'" />';
         echo '<button type="submit">'.get_string('mapcourses', 'feedback').'</button>';
         echo $OUTPUT->help_icon('mapcourse', 'feedback');
+        echo '</fieldset>';
         echo '</form>';
         echo '<br />';
         echo '</div>';