diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index 043daee..90bc02e 100644
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -28,9 +28,12 @@
 
 /// Print the header
     if ($course->category) {
-        $navigation = "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
+        $navigation = build_navigation(array('link' => $CFG->wwwroot ."/course/view.php?id=". $course->id, 'name' => $course->shortname, 'type' => 'course'));
+    } else {
+        $navigation = build_navigation('');
     }
-    print_header("$course->shortname: $strwikis", "$course->fullname", "$navigation $strwikis", "", '', true, "", navmenu($course));
+
+    print_header("$course->shortname: $strwikis", "$course->fullname", $navigation, '', '', true, '', navmenu($course));
 
 /// Get all the appropriate data
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index c377037..6348fcb 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -110,7 +110,9 @@ class page_wiki extends page_generic_activity {
         else {
             $buttons = '&nbsp;';
         }
-        print_header($title, $this->courserecord->fullname, $crumbtext, '', '', true, $buttons, navmenu($this->courserecord, $this->modulerecord));
+        $navigation = build_navigation('', $this->modulerecord);
+        //print_header($title, $this->courserecord->fullname, $navigation, '', '', true, $buttons);
+        print_header($title, $this->courserecord->fullname, $navigation, '', '', true, $buttons);
 
     }
    
@@ -118,4 +120,4 @@ class page_wiki extends page_generic_activity {
    
 
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 146e30c..ff1d539 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -388,10 +388,8 @@ function wiki_print_groupmode_selection(&$WS){
    //Course groups list
 
    $listgroups = get_records_sql('SELECT g.id, g.name
-               FROM '. $CFG->prefix.'groups g,
-                    '. $CFG->prefix.'groups_courses_groups gcg
-               WHERE gcg.courseid=\''.$COURSE->id.'\'
-                    AND gcg.groupid = g.id
+               FROM '. $CFG->prefix.'groups g
+               WHERE g.courseid=\''.$COURSE->id.'\'
                     ORDER BY name');
 
    //Course students list
@@ -406,11 +404,9 @@ function wiki_print_groupmode_selection(&$WS){
    $listgroupsmembers = get_records_sql('SELECT gm.id as groupsmembersid, u.id, g.id as groupid, g.name as groupname, u.firstname, u.lastname
                FROM '. $CFG->prefix.'groups g,
                     '. $CFG->prefix.'groups_members gm,
-                    '. $CFG->prefix.'groups_courses_groups gcg,
                     '. $CFG->prefix.'user u
-               WHERE gcg.courseid=\''.$COURSE->id.'\'
+               WHERE g.courseid=\''.$COURSE->id.'\'
                    AND g.id = gm.groupid
-                   AND g.id = gcg.groupid
                    AND u.id = gm.userid
                    ORDER BY g.name, u.lastname');
 
@@ -514,4 +510,4 @@ function wiki_print_teacher_selection($cm, $dfwiki){
 /// starts with wiki_
 
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index 2aadbe5..7e7157a 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -2967,24 +2967,20 @@ function wiki_print_menu_groups_and_students($listgroups, $listgroupsmembers, &$
             //the user group
             $usergroupid =get_record_sql('SELECT g.id as id
                 FROM '. $CFG->prefix.'groups g,
-                     '. $CFG->prefix.'groups_members gm,
-                     '. $CFG->prefix.'groups_courses_groups gcg
+                     '. $CFG->prefix.'groups_members gm
                 WHERE gm.userid = \''.$USER->id.'\'
                     AND gm.groupid = g.id
-                    AND gcg.groupid = g.id
-                    AND gcg.courseid=\''.$COURSE->id.'\'');
+                    AND g.courseid=\''.$COURSE->id.'\'');
            if(empty($usergroupid)){
                return;
            }
             //groups list without the user group
             $listgroups = get_records_sql('SELECT DISTINCT g.id, g.name
                 FROM '. $CFG->prefix.'groups g,
-                     '. $CFG->prefix.'groups_members gm,
-                     '. $CFG->prefix.'groups_courses_groups gcg
+                     '. $CFG->prefix.'groups_members gm
                 WHERE gm.groupid <> '.$usergroupid->id.'
                     AND gm.groupid = g.id
-                    AND gcg.groupid = g.id
-                    AND gcg.courseid=\''.$COURSE->id.'\'');
+                    AND g.courseid=\''.$COURSE->id.'\'');
 
             //Course students list without the user group
             //We take the groups, and id, firstname and lastname of the students
@@ -2992,9 +2988,7 @@ function wiki_print_menu_groups_and_students($listgroups, $listgroupsmembers, &$
                 FROM '. $CFG->prefix.'groups g,
                      '. $CFG->prefix.'groups_members gm,
                      '. $CFG->prefix.'user u
-                     '. $CFG->prefix.'groups_courses_groups gcg
-                WHERE gcg.courseid=\''.$COURSE->id.'\'
-                    AND g.id = gcg.groupid
+                WHERE g.courseid=\''.$COURSE->id.'\'
                     AND gm.groupid <> '.$usergroupid->id.'
                     AND g.id = gm.groupid
                     AND u.id = gm.userid
@@ -3268,12 +3262,10 @@ function wiki_can_edit(&$WS){
            if(($student_can_edit == true) && ($WS->dfwiki->editanothergroup == 0) && ($WS->dfwiki->groupmode != 0)){
                $usergroup = get_record_sql('SELECT gm.groupid
                        FROM '. $CFG->prefix.'groups g,
-                            '. $CFG->prefix.'groups_members gm,
-                            '. $CFG->prefix.'groups_courses_groups gcg
+                            '. $CFG->prefix.'groups_members gm
                        WHERE gm.userid=\''.$USER->id.'\'
                              AND gm.groupid=g.id
-                             AND gcg.groupid=g.id
-                             AND gcg.courseid=\''.$COURSE->id.'\'');
+                             AND g.courseid=\''.$COURSE->id.'\'');
 
                $can_edit = false;
                 if (isset($usergroup->groupid))
diff --git a/mod/wiki/timeline/wikitimeline.php b/mod/wiki/timeline/wikitimeline.php
index bb4e006..8af3ec7 100644
--- a/mod/wiki/timeline/wikitimeline.php
+++ b/mod/wiki/timeline/wikitimeline.php
@@ -348,10 +348,8 @@ function wiki_array_groupmode_selection(&$WS, $id, $gid, $uid){
    //Course groups list
 
    $listgroups = get_records_sql('SELECT g.id, g.name
-               FROM '. $CFG->prefix.'groups g,
-                    '. $CFG->prefix.'groups_courses_groups gcg
-               WHERE gcg.courseid=\''.$COURSE->id.'\'
-                    AND gcg.groupid = g.id
+               FROM '. $CFG->prefix.'groups g
+               WHERE g.courseid=\''.$COURSE->id.'\'
                     ORDER BY name');
 
    //Course students list
@@ -361,11 +359,9 @@ function wiki_array_groupmode_selection(&$WS, $id, $gid, $uid){
    $listgroupsmembers = get_records_sql('SELECT gm.id as groupsmembersid, u.id, g.id as groupid, g.name as groupname, u.firstname, u.lastname
                FROM '. $CFG->prefix.'groups g,
                     '. $CFG->prefix.'groups_members gm,
-                    '. $CFG->prefix.'groups_courses_groups gcg,
                     '. $CFG->prefix.'user u
-               WHERE gcg.courseid=\''.$COURSE->id.'\'
+               WHERE g.courseid=\''.$COURSE->id.'\'
                    AND g.id = gm.groupid
-                   AND g.id = gcg.groupid
                    AND u.id = gm.userid
                    ORDER BY g.name, u.lastname');
 
@@ -517,22 +513,18 @@ function wiki_timeline_print_menu_groups_and_students($id, $gid, $uid, $listgrou
             //the user group
             $usergroupid =get_record_sql('SELECT g.id as id
                 FROM '. $CFG->prefix.'groups g,
-                     '. $CFG->prefix.'groups_members gm,
-                     '. $CFG->prefix.'groups_courses_groups gcg
+                     '. $CFG->prefix.'groups_members gm
                 WHERE gm.userid = \''.$USER->id.'\'
                     AND gm.groupid = g.id
-                    AND gcg.groupid = g.id
-                    AND gcg.courseid=\''.$COURSE->id.'\'');
+                    AND g.courseid=\''.$COURSE->id.'\'');
 
             //groups list without the user group
             $listgroups = get_records_sql('SELECT DISTINCT g.id, g.name
                 FROM '. $CFG->prefix.'groups g,
-                     '. $CFG->prefix.'groups_members gm,
-                     '. $CFG->prefix.'groups_courses_groups gcg
+                     '. $CFG->prefix.'groups_members gm
                 WHERE gm.groupid <> '.$usergroupid->id.'
                     AND gm.groupid = g.id
-                    AND gcg.groupid = g.id
-                    AND gcg.courseid=\''.$COURSE->id.'\'');
+                    AND g.courseid=\''.$COURSE->id.'\'');
 
             //Course students list without the user group
             //We take the groups, and id, firstname and lastname of the students
@@ -540,9 +532,7 @@ function wiki_timeline_print_menu_groups_and_students($id, $gid, $uid, $listgrou
                 FROM '. $CFG->prefix.'groups g,
                      '. $CFG->prefix.'groups_members gm,
                      '. $CFG->prefix.'user u
-                     '. $CFG->prefix.'groups_courses_groups gcg
-                WHERE gcg.courseid=\''.$COURSE->id.'\'
-                    AND g.id = gcg.groupid
+                WHERE g.courseid=\''.$COURSE->id.'\'
                     AND gm.groupid <> '.$usergroupid->id.'
                     AND g.id = gm.groupid
                     AND u.id = gm.userid
@@ -683,4 +673,4 @@ function wiki_timeline_print_menu_students_in_group($id, $gid, $uid,$listgroupsm
 */
 
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/wiki/wikistorage.class.php b/mod/wiki/wikistorage.class.php
index fa65a2c..ffd7db1 100644
--- a/mod/wiki/wikistorage.class.php
+++ b/mod/wiki/wikistorage.class.php
@@ -102,12 +102,10 @@ class storage{
        }else{
            if (!$this->groupmember = get_record_sql('SELECT gm.groupid, gm.userid
                    FROM '. $CFG->prefix.'groups g, 
-                        '. $CFG->prefix.'groups_members gm, 
-                        '. $CFG->prefix.'groups_courses_groups gcg 
+                        '. $CFG->prefix.'groups_members gm 
                    WHERE gm.userid=\''.$USER->id.'\' 
-                         AND gcg.groupid = g.id 
                          AND gm.groupid = g.id 
-                         AND gcg.courseid = \''.$COURSE->id.'\'')){
+                         AND g.courseid = \''.$COURSE->id.'\'')){
                $this->groupmember->groupid = '0';
            }
            if ($this->dfwiki->groupmode == '0'){