diff --git a/client/src/components/InstrumentTeaser.vue b/client/src/components/InstrumentTeaser.vue
index bcf312c0..b63a1a6f 100644
--- a/client/src/components/InstrumentTeaser.vue
+++ b/client/src/components/InstrumentTeaser.vue
@@ -1,16 +1,16 @@
 <template>
-  <div class="instrument-teaser">
+  <router-link tag="div" :to="{name: 'instrument', params: {slug: slug}}" class="instrument-teaser">
     <h3 class="instrument-teaser__title">{{title}}</h3>
     <p class="instrument-teaser__text" v-html="teaser">
     </p>
-  </div>
+  </router-link>
 </template>
 
 <script>
   import teaser from '@/helpers/teaser';
 
   export default {
-    props: ['title', 'contents'],
+    props: ['title', 'contents', 'slug'],
 
     computed: {
       teaser() {
@@ -30,6 +30,7 @@
     padding: $medium-spacing;
     @include widget-shadow;
     width: 100%;
+    cursor: pointer;
 
     &__title {
       @include heading-3;
diff --git a/client/src/components/book-navigation/BookNavigation.vue b/client/src/components/book-navigation/BookNavigation.vue
index 33d8aaa2..debb476e 100644
--- a/client/src/components/book-navigation/BookNavigation.vue
+++ b/client/src/components/book-navigation/BookNavigation.vue
@@ -4,8 +4,8 @@
       <book-topic-navigation></book-topic-navigation>
     </sub-navigation-item>
     <sub-navigation-item title="Instrument">
-        <router-link tag="div" class="book-subnavigation__item" to="/basic-knowledge">Sprache und Kommunikation</router-link>
-        <router-link tag="div" class="book-subnavigation__item" to="/basic-knowledge">Gesellschaft</router-link>
+        <router-link tag="div" class="book-subnavigation__item" to="/instruments/sprache-kommunikation">Sprache und Kommunikation</router-link>
+        <router-link tag="div" class="book-subnavigation__item" to="/instruments/gesellschaft">Gesellschaft</router-link>
     </sub-navigation-item>
     <sub-navigation-item title="News">
       <template slot="title">
diff --git a/client/src/pages/instrumentOverview.vue b/client/src/pages/instrumentOverview.vue
index 8d8bcf81..c5df2c5f 100644
--- a/client/src/pages/instrumentOverview.vue
+++ b/client/src/pages/instrumentOverview.vue
@@ -2,13 +2,12 @@
   <div class="instrument-overview">
     <div class="instrument-overview__heading">
       <h1 class="instrument-overview__title">
-        Instrument:<br> Sprache und Kommunikation
+        Instrument:<br> {{instrumentType}}
       </h1>
     </div>
     <div class="instrument-overview__list">
       <instrument-teaser
-        :title="instrument.title"
-        :contents="instrument.contents"
+        v-bind="instrument"
         v-for="instrument in instruments"
         :key="instrument.id"
       ></instrument-teaser>
@@ -25,11 +24,19 @@
       InstrumentTeaser
     },
 
+    computed: {
+      instrumentType () {
+        return this.$route.params.slug === 'gesellschaft' ? 'Gesellschaft' : 'Sprache und Kommunikation';
+      }
+    },
+
     apollo: {
       instruments: {
         query: INSTRUMENTS_QUERY,
-        variables: {
-          type: 'society'
+        variables() {
+          return {
+            type: this.$route.params.slug === 'gesellschaft' ? 'society' : 'language_communication'
+          }
         },
         manual: true,
         result({data, loading, networkStatus}) {
diff --git a/client/src/styles/_navigation.scss b/client/src/styles/_navigation.scss
index 4dd1b178..e97971f3 100644
--- a/client/src/styles/_navigation.scss
+++ b/client/src/styles/_navigation.scss
@@ -57,6 +57,7 @@
     padding: $large-spacing;
     width: 100%;
     box-sizing: border-box;
+    margin-top: 17px;
 
     &:empty {
       display: none;