diff --git a/main/inc/ajax/skill.ajax.php b/main/inc/ajax/skill.ajax.php
index a8b388e640..3a4721ad29 100644
--- a/main/inc/ajax/skill.ajax.php
+++ b/main/inc/ajax/skill.ajax.php
@@ -69,8 +69,6 @@ switch ($action) {
         $course_info = api_get_course_info($_REQUEST['code']);        
         $courses = CourseManager::process_hot_course_item(array($course_info));
         Display::display_no_header();        
-        Display::$global_template->assign('span_size', 9);
-        Display::$global_template->assign('show_ranking', false);
         Display::$global_template->assign('hot_courses', $courses);
         echo Display::$global_template->fetch('default/layout/hot_course_item_popup.tpl');
         break;
@@ -97,8 +95,7 @@ switch ($action) {
         echo Display::$global_template->fetch('default/skill/profile_item.tpl');
         break;    
     case 'get_skills':
-        $load_user_data = isset($_REQUEST['load_user_data']) ? $_REQUEST['load_user_data'] : null;
-        //$parent_id = intval($_REQUEST['parent_id']);
+        $load_user_data = isset($_REQUEST['load_user_data']) ? $_REQUEST['load_user_data'] : null;        
         $id = intval($_REQUEST['id']);
         $skills = $skill->get_all($load_user_data, false, $id);                    
         echo json_encode($skills);
diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php
index f437ee0aba..ac9706ab58 100644
--- a/main/inc/lib/skill.lib.php
+++ b/main/inc/lib/skill.lib.php
@@ -280,7 +280,7 @@ class Skill extends Model {
     var $required = array('name');
     
     /** Array of colours by depth, for the coffee wheel. Each depth has 4 col */
-    var $colours = array(
+    /*var $colours = array(
       0 => array('#f9f0ab', '#ecc099', '#e098b0', '#ebe378'),
       1 => array('#d5dda1', '#4a5072', '#8dae43', '#72659d'),
       2 => array('#b28647', '#2e6093', '#393e64', '#1e8323'),
@@ -292,7 +292,7 @@ class Skill extends Model {
       8 => array('#2e6093', '#2e6093', '#2e6093', '#2e6093'),
       9 => array('#3a5988', '#3a5988', '#3a5988', '#3a5988'),
      10 => array('#393e64', '#393e64', '#393e64', '#393e64'),
-    );
+    );*/
 
     public function __construct() {
         $this->table                      = Database::get_main_table(TABLE_MAIN_SKILL);
@@ -326,8 +326,7 @@ class Skill extends Model {
     }
 
     function get_all($load_user_data = false, $user_id = false, $id = null, $parent_id = null) {
-        $id_condition = '';
-        
+        $id_condition = '';        
         if (isset($id) && !empty($id)) {
             $id = intval($id);
             $id_condition = " WHERE s.id = $id";
@@ -345,7 +344,7 @@ class Skill extends Model {
         $sql = "SELECT s.id, s.name, s.description, ss.parent_id, ss.relation_type 
                 FROM {$this->table} s INNER JOIN {$this->table_skill_rel_skill} ss ON (s.id = ss.skill_id) $id_condition
                 ORDER BY ss.id, ss.parent_id";
-        
+                        
         $result = Database::query($sql);
         $skills = array();
 
@@ -358,22 +357,23 @@ class Skill extends Model {
                 $skills[$row['id']] = $row;
             }
         }
-
+        
+        /*
         if ($load_user_data && $user_id) {
-            $passed_skills = $this->get_user_skills($user_id);
+            $passed_skills = $this->get_user_skills($user_id);            
             foreach ($skills as &$skill) {
                 $skill['done_by_user'] = 0;
                 if (in_array($skill['id'], $passed_skills)) {
                     $skill['done_by_user'] = 1;
-
                 }
             }
-        }
-         
+        }*/
+  
+            
         //Load all children of the parent_id
         if (!empty($skills) && !empty($parent_id)) {           
             foreach ($skills as $skill) {
-                $children = self::get_all($load_user_data, $user_id, $id, $skill['id']);                
+                $children = self::get_all($load_user_data, $user_id, $id, $skill['id']);               
                  if (!empty($children)) {
                     //$skills = array_merge($skills, $children);
                     $skills = $skills + $children;
@@ -615,7 +615,7 @@ class Skill extends Model {
         } else {
             $skills = $this->get_all(false, false, null, $skill_id);
         }
-        
+                
         $original_skill = $skills;
 
         //var_dump($skills);
@@ -678,9 +678,7 @@ class Skill extends Model {
                 $skill['data']['skill_has_gradebook'] = false;                
                 if (isset($skill['gradebooks']) && !empty($skill['gradebooks'])) {
                     $skill['data']['skill_has_gradebook'] = true;
-                }                
-
-                
+                }
                 $refs[$skill['id']] = &$skill;
                 $flat_array[$skill['id']] =  &$skill;
             }
@@ -705,17 +703,15 @@ class Skill extends Model {
                 $skills[$skill_id]['data']['family_id'] = 1;
                 $refs['root']['children'][0]['children'][0] = $skills[$skill_id];
                 $flat_array[$skill_id] =  $skills[$skill_id];                
-            } else {            
-
-                
+            } else {
                 // Moving node to the children index of their parents
                 foreach ($skills as $my_skill_id => &$skill) {                
                     $skill['data']['family_id'] = $new_family_array[$skill['id']];
                     $refs[$skill['parent_id']]['children'][] = &$skill;
                     $flat_array[$my_skill_id] =  $skill;
-                }
-                
+                }                
             }
+            
             $skills_tree = array(
                 'name'      => get_lang('SkillRootName'),
                 'id'        => 'root',
@@ -764,7 +760,7 @@ class Skill extends Model {
                 if (is_array($elem['children'])) {
                     $tmp['children'] = $this->get_skill_json($elem['children'], $depth+1, $max_depth);                                        
                 } else {
-                    $tmp['colour'] = $this->colours[$depth][rand(0,3)];
+                    //$tmp['colour'] = $this->colours[$depth][rand(0,3)];
                 }
                 if ($depth > $max_depth) {
                     continue;
diff --git a/main/template/default/skill/skill_wheel.js.tpl b/main/template/default/skill/skill_wheel.js.tpl
index cd275f97d4..7869e82b53 100644
--- a/main/template/default/skill/skill_wheel.js.tpl
+++ b/main/template/default/skill/skill_wheel.js.tpl
@@ -125,7 +125,7 @@ bright red for missing skills, in the "Required skills" view for a student when
 */
   
 
-    function set_skill_style(d, attribute) {
+    function set_skill_style(d, attribute, searched_skill_id) {
         //Nice rainbow colors
         return_fill = get_color(d);        
         
@@ -150,6 +150,12 @@ bright red for missing skills, in the "Required skills" view for a student when
             return_fill = '#F89406';            
             //return_stroke = 'grey';
         }
+        //console.log(d.id +' - ' + searched_skill_id);
+        if (searched_skill_id) {
+            if (d.id ==  searched_skill_id) {
+          //      return_fill = '#B94A48';
+            }
+        }
         
         switch (attribute) {
             case 'fill':
@@ -454,7 +460,7 @@ function load_nodes(load_skill_id, main_depth) {
         .attr("class", "skill_partition skill_background")
     //        .style("fill", colour)
         .style("fill", function(d) {                 
-            return set_skill_style(d, 'fill');
+            return set_skill_style(d, 'fill', load_skill_id);
         })
         .style("stroke", function(d) {
             return set_skill_style(d, 'stroke');
diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl
index e55c559e62..2298087be4 100644
--- a/main/template/default/skill/skill_wheel.tpl
+++ b/main/template/default/skill/skill_wheel.tpl
@@ -422,12 +422,9 @@ $(document).ready(function() {
         }        
         return d.colour || "#fff";
     }*/
-
-
 });
 </script>
 
-
 <div class="container-fluid">
     <div class="row-fluid">
         
diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl
index 262108492b..16096850e4 100644
--- a/main/template/default/skill/skill_wheel_student.tpl
+++ b/main/template/default/skill/skill_wheel_student.tpl
@@ -55,7 +55,6 @@ function fill_skill_search_li(skill_id, skill_name, checked) {
     return '<li><a href="#" class="load_wheel" rel="'+skill_id+'">'+skill_name+'</a></li>';
 }
 
-
 function load_skill_info(skill_id) {
     $.ajax({
         url: url+'&a=get_skill_course_info&id='+skill_id,
@@ -93,7 +92,7 @@ $(document).ready(function() {
         load_nodes(skill_id, main_depth);
     });
     
-        
+    /* When clicking in a course title */
     $("#skill_info").on("click", "a.course_description_popup", function() {
         course_code = $(this).attr('rel');        
         $.ajax({
@@ -241,41 +240,7 @@ $(document).ready(function() {
             });
             
             $("#dialog-form").dialog("open");            
-        }  
-        
-        if (parent) {
-            $("#id").attr('value','');
-            $("#name").attr('value', '');
-            $("#short_code").attr('value', '');
-            $("#description").attr('value', '');
-            
-            //Filling parent_id                        
-            $("#parent_id").append('<option class="selected" value="'+parent.id+'" selected="selected" >');            
-            
-            $("#skill_edit_holder").append('<li class="bit-box">'+parent.name+'</li>');
-            
-            //Filling the gradebook_id
-            jQuery.each(parent.gradebooks, function(index, data) {                    
-                $("#gradebook_id").append('<option class="selected" value="'+data.id+'" selected="selected" >');
-                $("#gradebook_holder").append('<li id="gradebook_item_'+data.id+'" class="bit-box">'+data.name+' <a rel="'+data.id+'" class="closebutton" href="#"></a> </li>');    
-            });            
-            
-            $("#dialog-form").dialog({
-                buttons: {
-                     "{{ "Save"|get_lang }}" : function() {
-                         var params = $("#add_item").find(':input').serialize();
-                         add_skill(params);                     
-                      }
-           
-                },
-                close: function() {     
-                    $("#name").attr('value', '');
-                    $("#description").attr('value', '');
- 	                   load_nodes(0, main_depth);              
-                }
-            });
-            $("#dialog-form").dialog("open");        
-        }
+        }       
     }
 });
 </script>