diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php
index ba50fbcea8..d9d9ee5a84 100644
--- a/main/inc/lib/skill.lib.php
+++ b/main/inc/lib/skill.lib.php
@@ -124,24 +124,29 @@ class SkillRelGradebook extends Model {
     
     public function update_gradebooks_by_skill($skill_id, $gradebook_list) {
         $original_gradebook_list = $this->find('all', array('where'=>array('skill_id = ?' => array($skill_id))));
-        var_dump($original_gradebook_list);
+        //var_dump($original_gradebook_list);
         $gradebooks_to_remove = array();
         $gradebooks_to_add = array();
+        $original_gradebook_list_ids = array();
         
-        if (!empty($original_gradebook_list))
-        foreach ($original_gradebook_list as $gradebook) {
-            if (!in_array($gradebook['gradebook_id'], $gradebook_list)) {
-                $gradebooks_to_remove[] = $gradebook['id'];
+        if (!empty($original_gradebook_list)) {
+            foreach ($original_gradebook_list as $gradebook) {
+                if (!in_array($gradebook['gradebook_id'], $gradebook_list)) {
+                    $gradebooks_to_remove[] = $gradebook['id'];
+                }
+            }
+            foreach($original_gradebook_list as $gradebook_item) {
+                $original_gradebook_list_ids[] = $gradebook_item['gradebook_id'];
             }
         }
 
         if (!empty($gradebook_list))
         foreach($gradebook_list as $gradebook_id) {
-            if (!in_array($gradebook_id, array_keys($original_gradebook_list))) {
+            if (!in_array($gradebook_id, $original_gradebook_list_ids)) {
                 $gradebooks_to_add[] = $gradebook_id;
             }
         }
-                
+        //var_dump($gradebooks_to_add, $gradebooks_to_remove);
         if (!empty($gradebooks_to_remove)) {
             foreach($gradebooks_to_remove as $id) {
                $this->delete($id); 
diff --git a/main/template/default/skill/skill_tree.tpl b/main/template/default/skill/skill_tree.tpl
index d2615e9f63..9817a810d9 100644
--- a/main/template/default/skill/skill_tree.tpl
+++ b/main/template/default/skill/skill_tree.tpl
@@ -33,7 +33,7 @@ jsPlumb.bind("ready", function() {
         autoOpen: false,
         modal   : true, 
         width   : 550, 
-        height  : 380
+        height  : 480,
     });
     
     //Filling skills select
@@ -592,7 +592,7 @@ function checkLength( o, n, min, max ) {
 {$html}
 
 <div id="dialog-form" style="display:none;">
-    <div style="width:500px">
+    
     <form id="add_item" name="form">
         <input type="hidden" name="id" id="id"/>
         <div class="row">
@@ -632,6 +632,5 @@ function checkLength( o, n, min, max ) {
                 <textarea name="description" id="description" cols="40" rows="7"></textarea>
             </div>
         </div>  
-    </form>
-    </div>
+    </form>    
 </div>
\ No newline at end of file