diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 2368e66a8b0..c0037a35e28 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -58,14 +58,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index e69b9ad49c9..7e8047cc11e 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -52,14 +52,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index eaa0b0be829..1b6ee3680a4 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -123,14 +123,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check.
     //feedback in courses
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 9feb60f69e0..0d196d04921 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -102,14 +102,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check. hidden feedbacks except feedbacks on mainsite are only accessible with related capabilities
     if ((empty($cm->visible) and !$capabilities->viewhiddenactivities) AND $course->id != SITEID) {
diff --git a/mod/feedback/delete_completed.php b/mod/feedback/delete_completed.php
index 79b9807c2c3..ac733923207 100644
--- a/mod/feedback/delete_completed.php
+++ b/mod/feedback/delete_completed.php
@@ -65,14 +65,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/delete_item.php b/mod/feedback/delete_item.php
index dcf8e45b9da..c8727beb193 100644
--- a/mod/feedback/delete_item.php
+++ b/mod/feedback/delete_item.php
@@ -58,14 +58,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index 0e889059aa5..c7e03f3ae6d 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -72,14 +72,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');
diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 2476a6386f9..29719c2a113 100644
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -144,14 +144,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');
diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index 5a9d481b218..70a76a33804 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -115,14 +115,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// print the tabs
     include('tabs.php');
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 3267b2b0f88..d6b3e0e00d5 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -76,15 +76,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index dcef4b58444..2c6ce0d33bc 100644
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -26,14 +26,10 @@
     /// Print the page header
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
-    
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "", 'type' => 'activity');
-    
-    $navigation = build_navigation($navlinks);
-    
-    print_header_simple(get_string('modulename', 'feedback').' '.get_string('activities'), "",
-                 $navigation, "", "", true, null, navmenu($course));
+
+    $PAGE->navbar->add($strfeedbacks);
+    $PAGE->set_title(get_string('modulename', 'feedback').' '.get_string('activities'));
+    echo $OUTPUT->header();
 
     /// Get all the appropriate data
 
diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 199a08579d6..dfe9e3d12e7 100644
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -57,36 +57,17 @@
         }
     }
 
-    /// Print the page header
-    // $strfeedbacks = get_string("modulenameplural", "feedback");
-    // $strfeedback = get_string("modulename", "feedback");
-    // $navigation = '';
-
-    // $feedbackindex = '<a href="'.htmlspecialchars('index.php?id='.$course->id).'">'.$strfeedbacks.'</a> ->';
-    // if ($course->category) {
-        // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$course->id).'">'.$course->shortname.'</a> ->';
-    // }else if ($courseid > 0 AND $courseid != SITEID) {
-        // $usercourse = $DB->get_record('course', array('id'=>$courseid));
-        // $navigation = '<a href="'.htmlspecialchars('../../course/view.php?id='.$usercourse->id).'">'.$usercourse->shortname.'</a> ->';
-        // $feedbackindex = '';
-    // }
-
-    // print_header($course->shortname.': '.$feedback->name, $course->fullname,
-                // $navigation.' '.$feedbackindex.' <a href="'.htmlspecialchars('view.php?id='.$id).'">'.$feedback->name.'</a> -> '.get_string('mapcourses', 'feedback'),
-                // '', '', true, update_module_button($cm->id, $course->id, $strfeedback), navmenu($course, $cm));
     /// Print the page header
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     include('tabs.php');
 
diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index a6f14384a5b..6c8823b27a2 100644
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -41,15 +41,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 62eed2f5289..1306bf82865 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -68,14 +68,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     include('tabs.php');
 
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index b43f38ca00f..6f3de3f904e 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -63,14 +63,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index d3c478d16b4..f648c913672 100644
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -64,14 +64,12 @@
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     /// Print the main part of the page
     ///////////////////////////////////////////////////////////////////////////
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index b9bc3b67d6e..7abc102d41b 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -80,15 +80,13 @@
     $strfeedbacks = get_string("modulenameplural", "feedback");
     $strfeedback  = get_string("modulename", "feedback");
     $buttontext = update_module_button($cm->id, $course->id, $strfeedback);
+    
+    $PAGE->navbar->add($strfeedbacks, new moodle_url($CFG->wwwroot.'/mod/feedback/index.php', array('id'=>$course->id)));
+    $PAGE->navbar->add(format_string($feedback->name));
 
-    $navlinks = array();
-    $navlinks[] = array('name' => $strfeedbacks, 'link' => "index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($feedback->name), 'link' => "", 'type' => 'activityinstance');
-
-    $navigation = build_navigation($navlinks);
-
-    print_header_simple(format_string($feedback->name), "",
-                 $navigation, "", "", true, $buttontext, navmenu($course, $cm));
+    $PAGE->set_title(format_string($feedback->name));
+    $PAGE->set_button($buttontext);
+    echo $OUTPUT->header();
 
     //ishidden check.
     //feedback in courses