diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index 5204e3de13..85123b1727 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercice.php 18044 2009-01-28 16:53:27Z herodoto $
+<?php // $Id: exercice.php 18076 2009-01-29 16:51:02Z iflorespaz $
 
 /*
 ==============================================================================
@@ -289,7 +289,7 @@ if (in_array($origin, array('tracking_course','user_course'))){
 }
 if ($_GET['gradebook'] && $_GET['exerciseId']) {
 	$interbreadcrumb[]= array (
-			'url' => '../gradebook/index.php',
+			'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
 			'name' => get_lang('Gradebook')
 		);
 }
diff --git a/main/forum/newthread.php b/main/forum/newthread.php
index 7409dd633a..427abb3b02 100644
--- a/main/forum/newthread.php
+++ b/main/forum/newthread.php
@@ -126,7 +126,7 @@ if (!empty($_SESSION['toolgroup'])) {
 } else {
 	if( (isset($_GET['gradebook']) && $_GET['gradebook']=='view') || ( isset($_POST['gradebook']) && $_POST['gradebook']=='view')) {
 			$interbreadcrumb[]= array (
-				'url' => '../gradebook/index.php',
+				'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
 				'name' => get_lang('Gradebook')
 			);
 	}
diff --git a/main/forum/viewthread.php b/main/forum/viewthread.php
index e65c0c3fd2..0776f5d17c 100644
--- a/main/forum/viewthread.php
+++ b/main/forum/viewthread.php
@@ -108,7 +108,7 @@ if (!empty($_SESSION['toolgroup'])) {
 } else {
 	if (!empty($_GET['gradebook'])) {
 			$interbreadcrumb[]= array (
-				'url' => '../gradebook/index.php',
+				'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
 				'name' => get_lang('Gradebook')
 			);
 	}
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index 99adadb4a7..261a848538 100644
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -284,7 +284,7 @@ class DisplayGradebook
 		$user_id=api_get_user_id();
 		$course_code=$my_category['course_code'];
 		$status_user=api_get_status_of_user_in_course ($user_id,$course_code);
-		if ($status_user==1 && ($is_course_admin) && (!isset ($_GET['search']))) {
+		if (($status_user==1 && $is_course_admin && !isset ($_GET['search'])) || api_is_platform_admin()) {
 			if ($selectcat == '0') {
                 if ($show_add_qualification === true) {
 				   // $header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=0"><img src="../img/folder_new.gif" alt="' . get_lang('NewCategory') . '" /> ' . get_lang('NewCategory') . '</a></td>';
@@ -317,9 +317,9 @@ class DisplayGradebook
                  	$header .= '<td><a href="gradebook_edit_all.php?id_session='.$_SESSION['id_session'].'&amp;'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('quiz.gif', get_lang('EditAllWeights')).' ' . get_lang('EditAllWeights') . '</a>';
                 	$my_course_id=api_get_course_id();
                 	$my_file= substr($_SESSION['gradebook_dest'],0,5);
-                	if ($my_file!='index' && $status_user==1) {
+                	if (($my_file!='index' && $status_user==1) || api_is_platform_admin()) {
 	                	$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
-						if ($is_course_admin && $message_resource===false && $status_user==1) {
+						if (($is_course_admin && $message_resource===false && $status_user==1) || api_is_platform_admin()) {
 							$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
 						}
 					}
diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php
index 3ae7e6cddc..59d21bcf8d 100644
--- a/main/gradebook/lib/fe/gradebooktable.class.php
+++ b/main/gradebook/lib/fe/gradebooktable.class.php
@@ -198,7 +198,7 @@ class GradebookTable extends SortableTable
 				
 				if (empty($_GET['selectcat'])) {
 					if (isset($certificate_min_score) && (int)$item_value >= (int)$certificate_min_score) {
-						$certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/index.php?export_certificate=yes&cat_id='.$id.'"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" /></a>&nbsp;'.$scoretotal_display; 	
+						$certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/'.$_SESSION['gradebook_dest'].'?export_certificate=yes&cat_id='.$id.'"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" /></a>&nbsp;'.$scoretotal_display; 	
 					} else {
 						$certificates = '-';	
 					}					
@@ -266,7 +266,7 @@ private function build_id_column ($item) {
 				if (api_is_allowed_to_create_course() && $show_message===false) {
 					
 					return '&nbsp;'
-						. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+						. '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">'
 						. $item->get_name()
 						. '</a>&nbsp;['.get_lang('Evaluation').']';
 				} elseif (ScoreDisplay :: instance()->is_custom() && $show_message===false) {