diff --git a/grade/lib.php b/grade/lib.php
index 6c183527529..86f038f5139 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -315,11 +315,7 @@ function print_grade_plugin_selector($plugin_info, $return=false) {
 
         $first_plugin = reset($plugins);
 
-        if (is_array($first_plugin)) {
-            $menu[$first_plugin['link'].'&'] = '**header**'.$plugin_info['strings'][$plugin_type];
-        } else {
-            $menu[$plugins['link']] = '**header**'.$plugins['string'];
-        }
+        $menu[$first_plugin['link'].'&'] = '--'.$plugin_info['strings'][$plugin_type];
 
         if (empty($plugins['id'])) {
             foreach ($plugins as $plugin) {
@@ -332,7 +328,6 @@ function print_grade_plugin_selector($plugin_info, $return=false) {
 /// finally print/return the popup form
     if ($count > 1) {
         $select = popup_form('', $menu, 'choosepluginreport', '', get_string('chooseaction', 'grades'), '', '', true, 'self');
-        $select = preg_replace('/\>\*\*header\*\*/', ' class="optionheader">', $select);
         if ($return) {
             return $select;
         } else {
@@ -444,7 +439,8 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
             $active = $url;
         }
 
-        $plugin_info['settings'] = array('id' => 'coursesettings', 'link' => $url, 'string' => get_string('settings'));
+        $plugin_info['settings'] = array();
+        $plugin_info['settings']['course'] = array('id' => 'coursesettings', 'link' => $url, 'string' => get_string('course'));
         $count++;
     }
 
@@ -515,13 +511,15 @@ function grade_get_plugin_info($courseid, $active_type, $active_plugin) {
                 $active = $url;
             }
 
+            $plugin_info['scale'] = array();
+
             if ($active_type == 'scale' and $active_plugin == 'edit') {
                 $edit_url = $url_prefix.'edit/scale/edit.php?courseid='.$courseid.'&id='.optional_param('id', 0, PARAM_INT);
                 $active = $edit_url;
-                $plugin_info['scale'] = array('id' => 'edit', 'link' => $edit_url, 'string' => get_string('edit'),
+                $plugin_info['scale']['view'] = array('id' => 'edit', 'link' => $edit_url, 'string' => get_string('edit'),
                     'parent' => array('id' => 'scale', 'link' => $url, 'string' => get_string('scales')));
             } else {
-                $plugin_info['scale'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('scales'));
+                $plugin_info['scale']['view'] = array('id' => 'scale', 'link' => $url, 'string' => get_string('view'));
             }
 
             $count++;
diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index f097ea0c36d..b91c53bf1f1 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -586,9 +586,6 @@ body#grade-index .grades .header {
     font-style: normal;
 }
 
-#choosepluginreport_jump option.optionheader {
-    font-weight: bold;
-}
 /***
  *** Login
  ***/
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 80b1cd59b29..5f18d4762bd 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2301,14 +2301,6 @@ div.allcoursegrades {
     margin-top: 7px;
 }
 
-#choosepluginreport_jump option {
-    margin-left: 20px;
-}
-
-#choosepluginreport_jump option.optionheader {
-    margin-left: 0px;
-}
-
 /***
  *** Login
  ***/