diff --git a/src/views/Questionnaire.vue b/src/views/Questionnaire.vue
index a519e87..914db6e 100644
--- a/src/views/Questionnaire.vue
+++ b/src/views/Questionnaire.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="questionnaire">
-        <img id="back-button" v-if="$route.params.id != 0" v-on:click="goBack()" src="../assets/arrow-circle-left-outline.svg">
+        <img id="back-button" v-on:click="goBack()" src="../assets/arrow-circle-left-outline.svg">
         <div id="status-bar-wrapper">
           <div class="progress">
               <div v-bind:key="n" v-for="n in $store.state.questions.length" v-bind:class="getDotClass(n)"></div>
@@ -32,6 +32,9 @@
                     const previousQuestion = parseInt(this.$route.params.id) - 1
                     this.$router.push("/questionnaire/" + previousQuestion)
                 }
+                else {
+                    this.$router.push("/")
+                }
             }
         },
     }
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 8dedbcf..7e60cdd 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -5,9 +5,6 @@
             <p class="risk-chance warning" v-if="risk >= 33 && risk < 66">durchschnittlich</p>
             <p class="risk-chance success" v-if="risk < 33 && risk >= 0">niedrig</p>
             <p class="risk-chance" v-if=" risk < 0">nicht feststellbar</p>
-        <p class="text-center"><router-link style="text-decoration:none" to="/">
-            Zurück zum Anfang
-        </router-link></p>
         <p v-if="bad.length > 0">Auf Folgendes sollten Sie achten:</p>
         <div v-for="card in bad" v-bind:key="card.description" class="card-advice alert">
             <div class="card-advice-title">{{ card.title }}</div>
@@ -23,6 +20,9 @@
             <div class="card-advice-title">{{ card.title }}</div>
             <div class="card-advice-description">{{ card.description }}</div>
         </div>
+        <p class="text-center"><router-link to="/">
+            Zurück zum Anfang
+        </router-link></p>
     </div>
 </template>