diff --git a/package.json b/package.json
index c4666656..7686a793 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "sapper dev",
     "build": "sapper build --legacy",
-    "export": "sapper export --legacy --entry \"/ api auth login signup courses dashboard discussions people timetable profile discussions\"",
+    "export": "sapper export --legacy --entry \"/ login signup courses dashboard discussions people timetable profile discussions\"",
     "start": "node __sapper__/build"
   },
   "dependencies": {
@@ -58,4 +58,4 @@
     "tslib": "^2.3.1",
     "typescript": "^4.1.3"
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/Courses/api.js b/src/components/Courses/api.js
index 5dfacca3..8a99c133 100644
--- a/src/components/Courses/api.js
+++ b/src/components/Courses/api.js
@@ -1,16 +1,13 @@
 import { supabase } from '../../utils/functions/supabase';
 
-export async function fetchCourses(userId) {
-  const { data: orgMember } = await supabase
-    .from('organizationmember')
-    .select(`organization_id`)
-    .eq('profile_id', userId)
-    .single();
+export async function fetchCourses(profileId) {
+  if (!profileId) return;
 
   const { data: allCourses } = await supabase
-    .from('course')
-    .select(`id, title, description`)
-    .eq('organization_id', orgMember.organization_id);
+    .rpc('get_courses')
+    .eq('profile_id', profileId);
 
-  return { allCourses, organizationId: orgMember.organization_id };
+  console.log(`allCourses`, allCourses);
+
+  return { allCourses };
 }
diff --git a/src/components/Navigation/index.svelte b/src/components/Navigation/index.svelte
index 3748f9f4..e4193e2b 100644
--- a/src/components/Navigation/index.svelte
+++ b/src/components/Navigation/index.svelte
@@ -28,7 +28,7 @@
     </div>
 
     {#if $user.isLoggedIn}
-      <li>
+      <li class="hidden">
         <a
           class="block"
           aria-current={segment === undefined || segment === 'dashboard'
@@ -50,7 +50,7 @@
         </a>
       </li>
 
-      <li>
+      <li class="hidden">
         <a
           class="block"
           aria-current={segment === 'discussions' || segment === 'discussion'
@@ -62,7 +62,7 @@
         </a>
       </li>
 
-      <li>
+      <li class="hidden">
         <a
           class="block"
           aria-current={segment === 'people' ? 'page' : undefined}
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 244081a9..67b30d20 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -1,6 +1,5 @@
 <script context="module">
   export function preload(page, { config }) {
-    console.log(`page`, page);
     return { config, isMvpUser: !!page.query.mvp };
   }
 </script>
diff --git a/src/routes/courses.svelte b/src/routes/courses.svelte
index b7e1d16d..16192d54 100644
--- a/src/routes/courses.svelte
+++ b/src/routes/courses.svelte
@@ -5,14 +5,14 @@
   export async function preload(page, params) {
     const parsedUser = JSON.parse(params.user);
 
-    if (parsedUser && parsedUser.id) {
-      return fetchCourses(parsedUser.id);
-    }
+    // if (parsedUser && parsedUser.id) {
+    //   return fetchCourses(parsedUser.id);
+    // }
 
     return {
       allCourses: [],
       organizationId: null,
-      cantFetch: !parsedUser,
+      cantFetch: true,
     };
   }
 </script>
@@ -64,7 +64,7 @@
       title,
       description,
       group_id,
-      organization_id: organizationId,
+      // organization_id: organizationId,
     });
 
     // Get profile of author and add as member
@@ -100,7 +100,7 @@
   }
 
   async function getCourses(userId) {
-    console.log(`getCourses process.browser`, process.browser);
+    console.log(`getCourses process.browser`, process.browser, cantFetch);
     if (process.browser) {
       if (cantFetch && typeof cantFetch === 'boolean' && !allCourses.length) {
         const coursesResult = await fetchCourses(userId);
@@ -113,7 +113,6 @@
   }
 
   onMount(async () => {
-    console.log(`onMount cantFetch`, cantFetch);
     courses.set(allCourses);
   });
 
diff --git a/src/routes/courses/[id]/index.svelte b/src/routes/courses/[id]/index.svelte
index a04966f2..20283d7f 100644
--- a/src/routes/courses/[id]/index.svelte
+++ b/src/routes/courses/[id]/index.svelte
@@ -5,21 +5,23 @@
 </script>
 
 <script>
-  import { onMount } from 'svelte';
   import Overview from '../../../components/Course/index.svelte';
   import CourseContainer from '../../../components/CourseContainer/index.svelte';
-  import { setCourseData, course } from '../../../components/Course/store';
+  import { setCourseData } from '../../../components/Course/store';
   import { fetchCourse } from '../../../utils/services/courses';
 
   export let courseId;
 
-  onMount(async () => {
+  async function onCourseIdChange(courseId) {
+    if (!courseId) return;
     console.log(`overview courseId`, courseId);
-    if ($course.id) return;
 
     const { data } = await fetchCourse(courseId);
+
     setCourseData(data);
-  });
+  }
+
+  $: onCourseIdChange(courseId);
 </script>
 
 <CourseContainer>
diff --git a/src/routes/courses/[id]/people.svelte b/src/routes/courses/[id]/people.svelte
index 0d42ff5c..49f0e4b3 100644
--- a/src/routes/courses/[id]/people.svelte
+++ b/src/routes/courses/[id]/people.svelte
@@ -75,10 +75,15 @@
             <p
               class="bg-yellow-500 w-1/4 text-sm text-center rounded-xl text-white"
             >
-              Pending confirmation
+              Pending Invite
             </p>
           {/if}
-          <p class="text-lg w-1/4 break-all">{person.email}</p>
+          <a
+            href="mailto:{person.email}"
+            class="text-md w-1/4 mx-2 text-blue-600"
+          >
+            {person.email}
+          </a>
           <p class="text-lg w-1/4 ">{ROLE_LABEL[person.role_id]}</p>
         </div>
       {/each}
diff --git a/src/routes/profile/[id].svelte b/src/routes/profile/[id].svelte
index d74bd07b..bce6a96f 100644
--- a/src/routes/profile/[id].svelte
+++ b/src/routes/profile/[id].svelte
@@ -135,7 +135,7 @@
           This are the organizations you work at
         </p>
 
-        <div class="my-3 py-2 px-4 border shadow-sm rounded-md">
+        <div class="hidden my-3 py-2 px-4 border shadow-sm rounded-md">
           <h4 class="m-0 font-normal">
             <a class="text-blue-700 font-bold" href="/courses"> CitiBim </a>
           </h4>
@@ -156,7 +156,7 @@
           </div>
         </div>
 
-        <div class="my-2 py-2 px-4 border shadow-sm rounded-md">
+        <div class="hidden my-2 py-2 px-4 border shadow-sm rounded-md">
           <h4 class="m-0 font-normal">
             <a class="text-blue-700 font-bold" href="/courses">
               Climate Change Group
diff --git a/src/utils/services/courses/index.js b/src/utils/services/courses/index.js
index f229c33f..828f4380 100644
--- a/src/utils/services/courses/index.js
+++ b/src/utils/services/courses/index.js
@@ -3,6 +3,7 @@ import { isUUID } from '../../functions/isUUID';
 import { QUESTION_TYPE } from '../../../components/Question/constants';
 
 export async function fetchCourse(courseId, session) {
+  console.log(`courseId`, courseId);
   let jsonUser;
 
   if (!process.browser) {