diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index 7b4d12d1..d1971035 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -9,7 +9,7 @@
         <a href="#" class="module-navigation__anchor">1.2 Die drei Lernorte</a>
         <a href="#" class="module-navigation__anchor">Lernzielkontrolle</a>
       </div>
-      <router-link tag="h3" to="/module/submissions" class="module-navigation__heading">Ergebnisse: Modul 1
+      <router-link tag="h3" to="/module/submissions" class="module-navigation__heading">Ergebnisse: {{module.metaTitle}}
       </router-link>
       <div class="module-navigation__anchors">
         <router-link to="/module/geld/submissions" class="module-navigation__anchor">Tauschvorgänge</router-link>
@@ -21,7 +21,12 @@
           Bank»
         </router-link>
         <router-link to="/module/geld/submissions" class="module-navigation__anchor">Anlageberatung</router-link>
-        <router-link to="/module/geld/submissions" class="module-navigation__anchor">Welche Geldanlage ist sinnvoll?
+
+
+        <router-link to="/module/geld/submissions"
+                     v-for="assignment in module.assignments"
+                     :key="assignment.id"
+                     class="module-navigation__anchor">{{assignment.title}}
         </router-link>
       </div>
     </nav>
@@ -30,13 +35,12 @@
 </template>
 
 <script>
-  import ASSIGNMENTS_QUERY from '@/graphql/gql/assignmentsQuery.gql';
+  import {moduleQuery} from '@/graphql/queries';
+  // import ASSIGNMENTS_QUERY from '@/graphql/gql/assignmentsQuery.gql';
 
   export default {
     apollo: {
-      assignments: {
-        query: ASSIGNMENTS_QUERY
-      }
+      module: moduleQuery
     }
   }
 </script>
diff --git a/client/src/graphql/gql/moduleDetailsQuery.gql b/client/src/graphql/gql/moduleDetailsQuery.gql
index 254ab586..82f7c160 100644
--- a/client/src/graphql/gql/moduleDetailsQuery.gql
+++ b/client/src/graphql/gql/moduleDetailsQuery.gql
@@ -1,4 +1,5 @@
 #import "./fragments/contentBlockParts.gql"
+#import "./fragments/assignmentParts.gql"
 query ModulesQuery($slug: String!) {
   module(slug: $slug) {
     id
@@ -7,6 +8,13 @@ query ModulesQuery($slug: String!) {
     metaTitle
     teaser
     intro
+    assignments {
+      edges {
+        node {
+          ...AssignmentParts
+        }
+      }
+    }
     objectiveGroups {
       edges {
         node {
diff --git a/client/src/graphql/queries.js b/client/src/graphql/queries.js
new file mode 100644
index 00000000..b79ebb4c
--- /dev/null
+++ b/client/src/graphql/queries.js
@@ -0,0 +1,13 @@
+import MODULE_DETAILS_QUERY from './gql/moduleDetailsQuery.gql';
+
+export function moduleQuery() {
+  return {
+    query: MODULE_DETAILS_QUERY,
+    variables: {
+      slug: this.$route.params.slug
+    },
+    update(data) {
+      return this.$getRidOfEdges(data).module || {};
+    }
+  }
+}
diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue
index 75919043..081777bf 100644
--- a/client/src/pages/module.vue
+++ b/client/src/pages/module.vue
@@ -3,8 +3,8 @@
 </template>
 
 <script>
-  import MODULE_DETAILS_QUERY from '@/graphql/gql/moduleDetailsQuery.gql';
   import ASSIGNMENTS_QUERY from '@/graphql/gql/assignmentsQuery.gql';
+  import {moduleQuery} from '@/graphql/queries';
 
   import Module from '@/components/modules/Module.vue';
 
@@ -14,18 +14,7 @@
     },
 
     apollo: {
-      module() {
-        return {
-          query: MODULE_DETAILS_QUERY,
-          variables: {
-            slug: this.$route.params.slug
-          },
-          update(data) {
-            const cleanedData = this.$getRidOfEdges(data);
-            return cleanedData.module || {};
-          }
-        }
-      },
+      module: moduleQuery,
       assignments: {
         query: ASSIGNMENTS_QUERY
       }