diff --git a/mod/choice/index.php b/mod/choice/index.php
index 66681a7f981..77dc4314bb8 100644
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -15,9 +15,10 @@
 
     $strchoice = get_string("modulename", "choice");
     $strchoices = get_string("modulenameplural", "choice");
+    $crumbs[] = array('name' => $strchoices, 'link' => '', 'type' => 'activity');
+    $navigation = build_navigation($crumbs, $course);
 
-    print_header_simple("$strchoices", "",
-                 "$strchoices", "", "", true, "", navmenu($course));
+    print_header_simple("$strchoices", "", $navigation, "", "", true, "", navmenu($course));
 
 
     if (! $choices = get_all_instances_in_course("choice", $course)) {
diff --git a/mod/choice/report.php b/mod/choice/report.php
index ac9355175da..bba22546e59 100644
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -39,9 +39,14 @@
     }
         
     if ($download <> "xls" and $download <> "txt" and $download <> "ods") {
-        print_header_simple(format_string($choice->name).": $strresponses", "",
-                 "<a href=\"index.php?id=$course->id\">$strchoices</a> ->
-                  <a href=\"view.php?id=$cm->id\">".format_string($choice->name,true)."</a> -> $strresponses", "", '', true,
+    	
+        $crumbs[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+        $crumbs[] = array('name' => format_string($choice->name), 'link' => "view.php?id=$cm->id", 'type' => 'activityinstance');
+        $crumbs[] = array('name' => $strresponses, 'link' => '', 'type' => 'title');
+
+        $navigation = build_navigation($crumbs, $course);    
+    
+        print_header_simple(format_string($choice->name).": $strresponses", "", $navigation, "", '', true,
                   update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));
     }
 
diff --git a/mod/choice/view.php b/mod/choice/view.php
index 56738367719..387fdaf3d8a 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -52,10 +52,12 @@
 
 
 /// Display the choice and possibly results
+    $crumbs[] = array('name' => $strchoices, 'link' => "index.php?id=$course->id", 'type' => 'activity');
+    $crumbs[] = array('name' => format_string($choice->name), 'link' => '', 'type' => 'activityinstance');
+    
+    $navigation = build_navigation($crumbs, $course);
 
-
-    print_header_simple(format_string($choice->name), "",
-                 "<a href=\"index.php?id=$course->id\">$strchoices</a> -> ".format_string($choice->name), "", "", true,
+    print_header_simple(format_string($choice->name), "", $navigation, "", "", true,
                   update_module_button($cm->id, $course->id, $strchoice), navmenu($course, $cm));
 
     add_to_log($course->id, "choice", "view", "view.php?id=$cm->id", $choice->id, $cm->id);