diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 965bbd0..de0e8e1 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -155,6 +155,7 @@ export default class App extends Vue
         pWaitFor(() => this.isAssignmentsReady()).then(() =>
         {
             // When the assignments are ready
+            // TODO: Display loading
             this.assignmentsReady = true;
 
             // Filter courses
diff --git a/src/components/app/app.vue b/src/components/app/app.vue
index 31f572c..aa251ee 100644
--- a/src/components/app/app.vue
+++ b/src/components/app/app.vue
@@ -1,13 +1,15 @@
 <template>
     <div id="app">
         <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
-        <navigation :courses="courses"
+        <navigation :courses="filteredCourses"
                     v-on:sign-out="signOut()"
                     v-on:navigation:select="onNavigate">
         </navigation>
 
         <div id="app-content">
-            <overall :courses="courses" v-if="selectedTab === 'overall' && assignmentsReady"></overall>
+            <overall :courses="filteredCourses"
+                     v-if="selectedTab === 'overall' && assignmentsReady">
+            </overall>
         </div>
     </div>
 </template>