diff --git a/package.json b/package.json
index 57433cd5e584cc6c012d4ccdd9143546e80c1274..e47b1b4841b9e62c7514db2109b0ab204e50c776 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mc_frontend",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "author": "Ionic Framework",
   "homepage": "https://ionicframework.com/",
   "scripts": {
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 13b96776ee19c8a2cd37e44acecffa7c78235dff..a2da0b40d6e054074b98dc1ba3ff465ae367c396 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,3 +1,14 @@
 <ion-app>
-  <ion-router-outlet></ion-router-outlet>
+    <ion-menu contentId="content1" side="start" menuId="{{HelperService.menuId}}">
+        <ion-header>
+            <ion-toolbar>
+                <ion-title>{{ 'MACHINA_CALLIDA' | translate }}</ion-title>
+            </ion-toolbar>
+        </ion-header>
+        <ion-content>
+            <ion-button
+                    (click)="HelperService.goToAuthorPage(navCtrl).then(closeMenu.bind(this))">{{ 'EXERCISE_GENERATE' | translate }}</ion-button>
+        </ion-content>
+    </ion-menu>
+    <ion-router-outlet id="content1"></ion-router-outlet>
 </ion-app>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 92f97755f36827181ea727c1850157893623f18d..85476987e296fd5d0b07887ebc58b8717d35f068 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import {Component} from '@angular/core';
 import {StatusBar} from '@ionic-native/status-bar/ngx';
-import {Config, Platform} from '@ionic/angular';
+import {Config, MenuController, NavController, Platform} from '@ionic/angular';
 import {SplashScreen} from '@ionic-native/splash-screen/ngx';
 import {TranslateService} from '@ngx-translate/core';
 import {HelperService} from 'src/app/helper.service';
@@ -10,13 +10,16 @@ import {HelperService} from 'src/app/helper.service';
     templateUrl: 'app.component.html'
 })
 export class AppComponent {
+    public HelperService = HelperService;
 
     constructor(platform: Platform,
                 public statusBar: StatusBar,
                 private translate: TranslateService,
                 private config: Config,
                 private splashScreen: SplashScreen,
-                public helperService: HelperService
+                public helperService: HelperService,
+                public navCtrl: NavController,
+                public menuCtrl: MenuController
     ) {
         platform.ready().then(() => {
             // Okay, so the platform is ready and our plugins are available.
@@ -27,6 +30,10 @@ export class AppComponent {
         this.initTranslate();
     }
 
+    closeMenu(result: boolean) {
+        this.menuCtrl.close(HelperService.menuId).then();
+    }
+
     initTranslate() {
         // Set the default language for translation strings, and the current language.
         this.translate.setDefaultLang('en');
@@ -43,5 +50,4 @@ export class AppComponent {
         //     this.config.set('backButtonText', values.BACK_BUTTON_TEXT); // 'ios',
         // });
     }
-
 }
diff --git a/src/app/author-detail/author-detail.page.ts b/src/app/author-detail/author-detail.page.ts
index 5f377069987eee885c74b12226b2e75c249e062c..7aa65ce67c383f838b8699b8d7bc4d0170c8e5ed 100644
--- a/src/app/author-detail/author-detail.page.ts
+++ b/src/app/author-detail/author-detail.page.ts
@@ -24,6 +24,6 @@ export class AuthorDetailPage {
   showPossibleReferences(corpus: CorpusMC) {
     this.corpusService.currentCorpus = corpus;
     this.corpusService.currentTextRange = new TextRange({start: ['', '', ''], end: ['', '', '']});
-    HelperService.goToTextRangePage(this.navCtrl);
+    HelperService.goToTextRangePage(this.navCtrl).then();
   }
 }
diff --git a/src/app/author/author.page.html b/src/app/author/author.page.html
index 91465497a2c8afdfe6dbfb076047ac05cbca990c..15abcf7fee984d49392c910456e27e363e30d95a 100644
--- a/src/app/author/author.page.html
+++ b/src/app/author/author.page.html
@@ -21,7 +21,7 @@
                 <br>
             </ion-col>
         </ion-row>
-        <ion-row *ngIf="HelperService.mostRecentSetup.currentCorpus && HelperService.mostRecentSetup.currentUrn">
+        <ion-row *ngIf="HelperService.mostRecentSetup?.currentCorpus && HelperService.mostRecentSetup?.currentUrn">
             <ion-col>
                 <a (click)="restoreLastSetup()">{{ [HelperService.mostRecentSetup.currentCorpus.author,
                     HelperService.mostRecentSetup.currentCorpus.title,
diff --git a/src/app/author/author.page.ts b/src/app/author/author.page.ts
index 4a6633d29017fad9dada53e7813bdbb4f38a9c72..c2780ed9b7cf1e3d4bb92d6ddca2310c3b30e97e 100644
--- a/src/app/author/author.page.ts
+++ b/src/app/author/author.page.ts
@@ -60,9 +60,9 @@ export class AuthorPage {
     restoreLastSetup() {
         this.corpusService.restoreLastCorpus().then(() => {
             if (HelperService.isVocabularyCheck) {
-                HelperService.goToVocabularyCheckPage(this.navCtrl);
+                HelperService.goToVocabularyCheckPage(this.navCtrl).then();
             } else {
-                HelperService.goToShowTextPage(this.navCtrl);
+                HelperService.goToShowTextPage(this.navCtrl).then();
             }
         }, () => {
         });
diff --git a/src/app/confirm-cancel/confirm-cancel.page.ts b/src/app/confirm-cancel/confirm-cancel.page.ts
index ec265944c1c16ccfc1bed5727f030e93f36df138..29c6f25e61eba37bdae9a6ee73c9512a16b1fd26 100644
--- a/src/app/confirm-cancel/confirm-cancel.page.ts
+++ b/src/app/confirm-cancel/confirm-cancel.page.ts
@@ -16,12 +16,12 @@ export class ConfirmCancelPage implements OnInit {
     }
 
     exit() {
-        HelperService.currentPopover.dismiss();
+        HelperService.currentPopover.dismiss().then();
         HelperService.currentPopover = null;
     }
 
     confirm() {
-        HelperService.goToHomePage(this.navCtrl);
+        HelperService.goToHomePage(this.navCtrl).then();
         this.exit();
     }
 }
diff --git a/src/app/exercise-list/exercise-list.page.ts b/src/app/exercise-list/exercise-list.page.ts
index 37805112a704940688c90e5e0561f7f32753b131..d945f59f1b22f84012509ab244703273029b6b29 100644
--- a/src/app/exercise-list/exercise-list.page.ts
+++ b/src/app/exercise-list/exercise-list.page.ts
@@ -120,7 +120,7 @@ export class ExerciseListPage implements OnInit {
             this.corpusService.annisResponse = ar;
             const met: MoodleExerciseType = MoodleExerciseType[exercise.exercise_type];
             this.corpusService.exercise.type = ExerciseType[met.toString()];
-            HelperService.goToPreviewPage(this.navCtrl);
+            HelperService.goToPreviewPage(this.navCtrl).then();
         }, () => {
         });
     }
diff --git a/src/app/exercise-parameters/exercise-parameters.page.ts b/src/app/exercise-parameters/exercise-parameters.page.ts
index 07870f3175b81418ecb4b16fb08fc9adb6c5d785..a267a2a83cc22d31793464b3e0a11c44dc5742ae 100644
--- a/src/app/exercise-parameters/exercise-parameters.page.ts
+++ b/src/app/exercise-parameters/exercise-parameters.page.ts
@@ -136,7 +136,7 @@ export class ExerciseParametersPage implements OnInit {
             this.corpusService.annisResponse.exercise_id = ar.exercise_id;
             this.corpusService.annisResponse.uri = ar.uri;
             this.corpusService.annisResponse.solutions = ar.solutions;
-            HelperService.goToPreviewPage(this.navCtrl);
+            HelperService.goToPreviewPage(this.navCtrl).then();
         }, async (error: HttpErrorResponse) => {
             HelperService.isLoading = false;
             HelperService.currentError = error;
diff --git a/src/app/helper.service.ts b/src/app/helper.service.ts
index 03f09894b2fb32a9cbd06da894da37c86c51522d..0e724e335dc934c2632ab2cb1815abf2bddacb13 100644
--- a/src/app/helper.service.ts
+++ b/src/app/helper.service.ts
@@ -80,6 +80,7 @@ export class HelperService {
         name: 'English',
         shortcut: 'en'
     }), new Language({name: 'Deutsch', shortcut: 'de'})];
+    public static menuId = 'menu1';
     public static mostRecentSetup: ApplicationState = null;
     public static partOfSpeechMap: { [rawValue: string]: PartOfSpeechValue } = {
         ADJ: PartOfSpeechValue.adjective,
@@ -135,55 +136,62 @@ export class HelperService {
         });
     }
 
-    static goToAuthorPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/author').then();
+    static goToAuthorPage(navCtrl: NavController): Promise<boolean> {
+        HelperService.isVocabularyCheck = false;
+        return navCtrl.navigateForward('/author');
     }
 
-    static goToExerciseListPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/exercise-list').then();
+    static goToExerciseListPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('/exercise-list');
     }
 
-    static goToExerciseParametersPage(navCtrl: NavController) {
-        navCtrl.navigateForward('exercise-parameters').then();
+    static goToExerciseParametersPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('exercise-parameters');
     }
 
-    static goToHomePage(navCtrl: NavController) {
-        navCtrl.navigateRoot('/home').then();
+    static goToHomePage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateRoot('/home');
     }
 
-    static goToImprintPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/imprint').then();
+    static goToImprintPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('/imprint');
     }
 
-    static goToInfoPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/info').then();
+    static goToInfoPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('/info');
     }
 
-    static goToPreviewPage(navCtrl: NavController) {
-        navCtrl.navigateForward('preview').then();
+    static goToPreviewPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('preview');
     }
 
-    static goToShowTextPage(navCtrl: NavController, isVocabularyCheck: boolean = false) {
-        navCtrl.navigateForward('/show-text').then(() => {
-            HelperService.isVocabularyCheck = isVocabularyCheck;
+    static goToShowTextPage(navCtrl: NavController, isVocabularyCheck: boolean = false): Promise<boolean> {
+        return new Promise<boolean>((resolve) => {
+            navCtrl.navigateForward('/show-text').then((result: boolean) => {
+                HelperService.isVocabularyCheck = isVocabularyCheck;
+                return resolve(result);
+            });
         });
     }
 
-    static goToSourcesPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/sources').then();
+    static goToSourcesPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('/sources');
     }
 
-    static goToTestPage(navCtrl: NavController) {
-        navCtrl.navigateRoot('/test').then();
+    static goToTestPage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateRoot('/test');
     }
 
-    static goToTextRangePage(navCtrl: NavController) {
-        navCtrl.navigateForward('/text-range').then();
+    static goToTextRangePage(navCtrl: NavController): Promise<boolean> {
+        return navCtrl.navigateForward('/text-range');
     }
 
-    static goToVocabularyCheckPage(navCtrl: NavController) {
-        navCtrl.navigateForward('/vocabulary-check').then(() => {
-            HelperService.isVocabularyCheck = true;
+    static goToVocabularyCheckPage(navCtrl: NavController): Promise<boolean> {
+        return new Promise<boolean>((resolve) => {
+            navCtrl.navigateForward('/vocabulary-check').then((result: boolean) => {
+                HelperService.isVocabularyCheck = true;
+                return resolve(result);
+            });
         });
     }
 
diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index f6093f9719ebbd7bb78ab750111b6902545f798c..f3064288c8ed03a0512fe88cc521927d896efad2 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -1,19 +1,21 @@
 <ion-header>
     <ion-toolbar>
-        <div class="toolbar-left">
-            <img src="assets/imgs/logo.png" width="32px" height="32px" alt="Logo von Callidus: Fuchs">
-        </div>
-        <div class="toolbar-left">
-            <ion-title>{{ 'MACHINA_CALLIDA' | translate }}</ion-title>
-        </div>
-        <div class="toolbar-right">
-            <ion-spinner *ngIf="HelperService.isLoading"></ion-spinner>
-            <ion-select [(ngModel)]="HelperService.currentLanguage" (ngModelChange)="changeLanguage($event)"
-                name="currentLanguage" placeholder="{{HelperService.currentLanguage?.name}}">
-                <ion-select-option *ngFor="let lang of HelperService.languages" value="{{lang.shortcut}}">{{lang.name}}
-                </ion-select-option>
-            </ion-select>
+        <ion-buttons slot="start">
+            <ion-menu-button autoHide="false"></ion-menu-button>
+        </ion-buttons>
+        <div class="home-logo">
+            <img src="assets/imgs/logo.png" width="32px" height="32px" alt="CALLIDUS Logo">
         </div>
+        <ion-buttons slot="end">
+            <div>
+                <ion-spinner *ngIf="HelperService.isLoading"></ion-spinner>
+                <ion-select [(ngModel)]="HelperService.currentLanguage" (ngModelChange)="changeLanguage($event)"
+                            name="currentLanguage" placeholder="{{HelperService.currentLanguage?.name}}">
+                    <ion-select-option *ngFor="let lang of HelperService.languages"
+                                       value="{{lang.shortcut}}">{{lang.name}}</ion-select-option>
+                </ion-select>
+            </div>
+        </ion-buttons>
     </ion-toolbar>
 </ion-header>
 
@@ -29,19 +31,8 @@
         </ion-row>
         <ion-row>
             <ion-col>
-                <div class="card">
-                    <img src="/assets/imgs/brain-creative.jpg" alt="Brain" style="width:80%; height:80%">
-                    <h1>{{ 'EXERCISE_GENERATE' | translate }}</h1>
-                    <p>{{'TEXT_SELECTION' | translate }}<br>
-                        {{'TEXT_COMPLEXITY' | translate }}<br>
-                        {{'VOCABULARY_CHECK' | translate }}<br>
-                        {{'EXERCISE_PARAMETERS' | translate }}<br>
-                        {{'PREVIEW' | translate }}
-                    </p>
-                    <p>
-                        <ion-button (click)="goToAuthorPage()">{{ 'CONTINUE' | translate }}</ion-button>
-                    </p>
-                </div>
+                <ion-button
+                        (click)="HelperService.goToAuthorPage(navCtrl).then()">{{ 'EXERCISE_GENERATE' | translate }}</ion-button>
             </ion-col>
             <ion-col>
                 <div class="card">
@@ -76,20 +67,8 @@
                 </div>
             </ion-col>
             <ion-col>
-                <div class="card">
-                    <img src="/assets/imgs/brain-creative.jpg" alt="Brain" style="width:80%; height:80%">
-                    <h1>{{ 'CONCEPT' | translate }}</h1>
-                    <p>{{'CONCEPT_VOCABULARY_ACQUISITION' | translate }}<br>
-                        {{'CONCEPT_UNIT' | translate }}<br>
-                        {{'CONCEPT_REPOSITORY' | translate }}<br>
-                        Software<br>
-                        {{'SOURCES' | translate }}<br>
-                    </p>
-                    <p>
-                        <ion-button (click)="HelperService.goToInfoPage(navCtrl)">{{ 'CONTINUE' | translate }}
-                        </ion-button>
-                    </p>
-                </div>
+                <ion-button
+                        (click)="HelperService.goToExerciseListPage(navCtrl).then()">{{ 'EXERCISE_LIST' | translate }}</ion-button>
             </ion-col>
         </ion-row>
         <ion-row>
diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss
index 7b4003794c4f2bc5c5196953d5b281d436e1a12c..78097aa59874f7968a737efa8e4dfe6c3ddd081c 100644
--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
@@ -1,3 +1,7 @@
+.home-logo {
+  text-align: center;
+}
+
 .lastMainElement {
   height: 40%;
 }
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 19287f71fd8dfdc95f3e8b7f76527176e529a50b..6227decb0ba0caca425ad227e122932b2325fb4a 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -50,11 +50,6 @@ export class HomePage implements OnInit {
         }
     }
 
-    goToAuthorPage() {
-        HelperService.isVocabularyCheck = false;
-        this.navCtrl.navigateForward('/author').then();
-    }
-
     refreshCorpora() {
         this.isCorpusUpdateInProgress = true;
         this.corpusService.getCorpora(0).then(async () => {
diff --git a/src/app/ranking/ranking.page.ts b/src/app/ranking/ranking.page.ts
index 5db81a757ad0fa6b54a1c3c3b6eef61661347c6d..0f1f066bc26cd207a62461c63506f066f53fbde9 100644
--- a/src/app/ranking/ranking.page.ts
+++ b/src/app/ranking/ranking.page.ts
@@ -33,7 +33,7 @@ export class RankingPage {
             const urnEnd: string = ar.nodes.slice(-1)[0].id.split('/')[1];
             this.corpusService.currentUrn = urnStart.concat('-', urnEnd.split(':').slice(-1)[0]);
             this.corpusService.processAnnisResponse(ar);
-            HelperService.goToShowTextPage(this.navCtrl, true);
+            HelperService.goToShowTextPage(this.navCtrl, true).then();
         }, async (error: HttpErrorResponse) => {
         });
     }
diff --git a/src/app/show-text/show-text.page.html b/src/app/show-text/show-text.page.html
index 6a8e5dce3741e2c4dc8f174018b59c08518b63dd..0a159b932a8fa4d55d816a58b7830f070000e2dd 100644
--- a/src/app/show-text/show-text.page.html
+++ b/src/app/show-text/show-text.page.html
@@ -21,7 +21,7 @@
         <ion-row>
             <ion-col>
                 <ion-button
-                        (click)="HelperService.goToExerciseParametersPage(navCtrl)">{{ "EXERCISE_SET_PARAMETERS" | translate}}</ion-button>
+                        (click)="HelperService.goToExerciseParametersPage(navCtrl).then()">{{ "EXERCISE_SET_PARAMETERS" | translate}}</ion-button>
             </ion-col>
             <ion-col>
                 <ion-button
diff --git a/src/app/test/test.page.html b/src/app/test/test.page.html
index 452d37d7872e99b2e7e7a1832525eb3615d04366..ec62e40e1c210e0ef40c34f7b375b6e4d0a8c186 100644
--- a/src/app/test/test.page.html
+++ b/src/app/test/test.page.html
@@ -174,7 +174,7 @@
                     <ion-icon name="send"></ion-icon>
                     <ion-label>{{ 'TEST_MODULE_SEND_DATA' | translate }}</ion-label>
                 </ion-tab-button>
-                <ion-tab-button (click)="HelperService.goToAuthorPage(navCtrl)">
+                <ion-tab-button (click)="HelperService.goToAuthorPage(navCtrl).then()">
                     <ion-icon name="walk"></ion-icon>
                     <ion-label>{{ 'EXERCISE_GENERATE' | translate }}</ion-label>
                 </ion-tab-button>
diff --git a/src/app/text-range/text-range.page.ts b/src/app/text-range/text-range.page.ts
index 064953ce3f79f5e51de24c0c087c0f9663cc737b..d1f454d48ff89530ca24d776e1f879a4fbdb71dc 100644
--- a/src/app/text-range/text-range.page.ts
+++ b/src/app/text-range/text-range.page.ts
@@ -238,11 +238,11 @@ export class TextRangePage {
                 this.corpusService.isTextRangeCorrect = true;
                 this.corpusService.getText().then(() => {
                     if (skipText) {
-                        HelperService.goToExerciseParametersPage(this.navCtrl);
+                        HelperService.goToExerciseParametersPage(this.navCtrl).then();
                     } else if (HelperService.isVocabularyCheck) {
-                        HelperService.goToVocabularyCheckPage(this.navCtrl);
+                        HelperService.goToVocabularyCheckPage(this.navCtrl).then();
                     } else {
-                        HelperService.goToShowTextPage(this.navCtrl);
+                        HelperService.goToShowTextPage(this.navCtrl).then();
                     }
                 }, () => {
                 });
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index fd831fdb118655464139556ef7c05503c4ba63fc..df8beaf5885f9540e0f4b9bfb2580c3bddca7d61 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -55,9 +55,6 @@
   }
 
   ion-buttons {
-    position: absolute;
-    right: 0;
-    top: 0;
     color: var(--ion-color-primary);
   }