diff --git a/src/App.vue b/src/App.vue
index 06e10c1..1f9cb27 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,15 @@
 <template>
-    <div class="container" id="content">
-        <router-view/>
+    <div class="container-fluid">
+        <div class="row" id="main-wrapper">
+            <Menu/>
+            <div class="col" id="page-wrapper">
+                <router-view/>
+            </div>
+        </div>
     </div>
 
     <TasksForTracker/>
     <History/>
-    <Menu/>
 </template>
 
 <script>
@@ -328,5 +332,16 @@ function playSound(sound, extension = null) {
 </script>
 
 <style>
+.main-wrapper div {
+    padding-top: 10px;
+}
+
+.menu-wrapper col {
+    padding: 0;
+    margin: 0;
+}
 
+#page-wrapper {
+    padding-top: 15px;
+}
 </style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 879d242..e981b25 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -2,175 +2,186 @@
 @import "~bootswatch/dist/materia/bootstrap.min.css";
 
 body {
-  background-color: #e7e7e7;
-}
-
-.container {
-  margin: 20px auto 20px auto;
+    background-color: #e7e7e7;
 }
 
 .tracker-action-button {
-  margin-top: 10px;
-  padding: 1px 5px 1px 5px;
-  width: 100%;
+    margin-top: 10px;
+    padding: 1px 5px 1px 5px;
+    width: 100%;
 }
 
 .delete-tracker-button {
-  margin-top: 10px;
-  margin-bottom: 15px;
-  padding: 1px 5px 1px 5px;
-  width: 100%;
+    margin-top: 10px;
+    margin-bottom: 15px;
+    padding: 1px 5px 1px 5px;
+    width: 100%;
 }
 
 .side-button-right {
-  font-size: 1.7em;
+    font-size: 1.7em;
 }
 
 .add-tracker-button {
-  font-size: 1.7em;
+    font-size: 1.7em;
 }
 
 .navbar-brand {
-  width: 100%;
+    width: 100%;
 }
 
 .logo-nav {
-  max-height: 35px;
-  margin: 5px;
+    max-height: 35px;
+    margin: 5px;
 }
 
 nav {
-  border-radius: 45px;
+    border-radius: 45px;
 }
 
 nav, .card {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 
 .modal-content {
-  max-width: 1000px;
+    max-width: 1000px;
 }
 
 .btn-full-width {
-  width: 100%;
+    width: 100%;
 }
 
 .timeTracking {
-  height: 635px;
-  overflow-y: scroll;
-  margin-bottom: 0;
-  padding-bottom: 0;
+    height: 635px;
+    overflow-y: scroll;
+    margin-bottom: 0;
+    padding-bottom: 0;
 }
 
 .ticket-history {
-  list-style: none;
-  padding-left: 0;
+    list-style: none;
+    padding-left: 0;
 }
 
 .trackingNameField {
-  max-height: 1em;
-  margin-bottom: 1px;
+    max-height: 1em;
+    margin-bottom: 1px;
 }
 
 #settingsModal .modal-dialog,
 #showTicketsModal .modal-dialog,
 #showArchivedTicketsModal .modal-dialog {
-  max-width: 900px;
+    max-width: 900px;
 }
 
 .btn {
-  text-transform: initial !important;
+    text-transform: initial !important;
 }
 
 .brand-title {
-  margin-left: 2em;
-  margin-top: 0.5em;
+    margin-left: 2em;
+    margin-top: 0.5em;
 }
 
 #settingsModal .form-group {
-  margin-bottom: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 .search-field {
-  display: inline-block;
-  max-width: 85%;
-  margin-left: 5%;
-}
-
-#left-menu {
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 90px;
-
-  align-content: center;
-  background-color: #bdbdbd;
-  border-right: 1px solid grey;
-  padding: 0;
+    display: inline-block;
+    max-width: 85%;
+    margin-left: 5%;
 }
 
 #content {
-  margin-left: 90px;
-  max-width: 85vw;
+    margin-left: 90px;
+    max-width: 85vw;
 }
 
 .bottom-menu-item {
-  width: 100%;
-  margin-bottom: 1em;
+    width: 100%;
+    margin-bottom: 1em;
 }
 
 .btn-switcher {
-  width: 100%;
+    width: 100%;
 }
 
 .container {
-  margin-top: 1em;
+    margin-top: 1em;
 }
 
 .form-control {
-  margin-bottom: 1em;
+    margin-bottom: 1em;
 }
 
 .switch-portal-button {
-  margin-bottom: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 .col-board-inner {
-  border-right:  1px solid grey;
+    border-right: 1px solid grey;
 }
 
 #board-view h5 {
-  text-align: center;
-  text-transform: uppercase;
-  color: dimgrey;
-  line-height: 0.7em;
-  word-spacing: 1px;
+    text-align: center;
+    text-transform: uppercase;
+    color: dimgrey;
+    line-height: 0.7em;
+    word-spacing: 1px;
 }
 
 .snippet-space-item {
-  display: none;
+    display: none;
 }
 
 .CodeMirror {
-  border-radius: 5px;
-  margin-top: 1em;
+    border-radius: 5px;
+    margin-top: 1em;
 }
 
 .btn-wide {
-  width: 5em;
-  margin-top: 1em;
-  margin-left: 1em;
+    width: 5em;
+    margin-top: 1em;
+    margin-left: 1em;
 }
 
 .finished-task {
-  text-decoration: line-through;
+    text-decoration: line-through;
 }
 
 #trackerTasksModal a li {
-  color: black !important;
+    color: black !important;
 }
 
 #trackerTasksModal input[type=range] {
-  width: 100%;
+    width: 100%;
+}
+
+#left-menu {
+    height: 100vh;
+    width: 90px;
+    display: inline-block;
+
+    background-color: #bdbdbd;
+    border-right: 1px solid grey;
+    padding: 15px 0;
+    margin: 0;
 }
+
+.menu-wrapper {
+    width: 90px;
+}
+
+.menu-wrapper col {
+    margin: 0;
+    padding: 0;
+}
+
+#left-menu:first-of-type(div) {
+    margin-top: 15px;
+}
+
+.left-menu-item {
+    margin: 0 10px;
+}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index b56297d..48a1291 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -75,7 +75,6 @@ export default createStore({
             state.trashed = {};
 
             state.trackers.pushToBeginning(restoredTracker);
-            state.updateStorage();
         },
         archiveTracker(state, index) {
             state.archive.pushToBeginning(state.trackers[index]);
diff --git a/src/views/Archive.vue b/src/views/Archive.vue
index 8069a1f..827fa4b 100644
--- a/src/views/Archive.vue
+++ b/src/views/Archive.vue
@@ -1,5 +1,5 @@
 <template>
-    <h5 class="modal-title"><i class="fas fa-archive"></i> Archivierte Tracker</h5>
+    <h5><i class="fas fa-archive"></i> Archivierte Tracker</h5>
     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
     <div class="row">
         <div class="col-sm-6"></div>
diff --git a/src/views/CustomBookForTracker.vue b/src/views/CustomBookForTracker.vue
index 80bb68b..1d308c1 100644
--- a/src/views/CustomBookForTracker.vue
+++ b/src/views/CustomBookForTracker.vue
@@ -4,7 +4,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-user-edit"></i> Buchung für {{selectedTracker.number}}</h5>
+                    <h5><i class="fas fa-user-edit"></i> Buchung für {{selectedTracker.number}}</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
diff --git a/src/views/HistoryForTracker.vue b/src/views/HistoryForTracker.vue
index a7c67af..153cc72 100644
--- a/src/views/HistoryForTracker.vue
+++ b/src/views/HistoryForTracker.vue
@@ -4,7 +4,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-history"></i> History von
+                    <h5><i class="fas fa-history"></i> History von
                         {{ $store.state.selectedTracker.number }}</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
diff --git a/src/views/Menu.vue b/src/views/Menu.vue
index e1285b9..50c06eb 100644
--- a/src/views/Menu.vue
+++ b/src/views/Menu.vue
@@ -1,75 +1,68 @@
 <template>
     <div id="left-menu">
-        <div class="container">
-            <div class="row">
-                <div class="col">
-                    <div class="dropup">
-                        <button class="btn btn-success text-light bottom-menu-item" type="button"
-                                id="create-dropdown-menu" data-bs-toggle="dropdown" aria-expanded="false" title="Neu">
-                            <i class="fas fa-plus"></i>
-                        </button>
-                        <ul class="dropdown-menu" aria-labelledby="create-dropdown-menu">
-                            <li>
-                                <button class="btn btn-light dropdown-menu-button" type="button"
-                                        @click="createTracker()">Tracker
-                                </button>
-                            </li>
-                            <li>
-                                <button class="btn btn-light dropdown-menu-button" type="button"
-                                        @click="createTimeBox()">Timebox
-                                </button>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                <div>
-                    <router-link to="/"
-                                 type="button"
-                                 class="btn btn-dark text-light bottom-menu-item"
-                                 data-bs-placement="left"
-                                 title="Home">
-                        <i class="fas fa-home"></i>
-                    </router-link>
-                </div>
-                <div class="" v-if="$store.state.trackers.length > 0">
-                    <router-link to="/trackers"
-                                 type="button"
-                                 class="btn btn-primary text-light bottom-menu-item"
-                                 data-bs-placement="left"
-                                 title="Alle Tracker">
-                        <i class="fas fa-clock"></i>
-                    </router-link>
-                </div>
-                <div class="" v-if="$store.state.archive.length > 0">
-                    <router-link to="/archive"
-                                 type="button"
-                                 class="btn btn-warning bottom-menu-item"
-                                 data-bs-placement="left"
-                                 title="Archivierte Tracker">
-                        <i class="fas fa-archive"></i>
-                    </router-link>
-                </div>
-                <div class="" v-if="($store.state.trackers.length + $store.state.archive.length) > 0">
-                    <a type="button"
-                       class="btn btn-info text-light bottom-menu-item"
-                       data-bs-toggle="offcanvas"
-                       data-bs-target="#pastDaysModal"
-                       data-bs-placement="top"
-                       title="Buchungsverlauf">
-                        <i class="fas fa-history"></i>
-                    </a>
-                </div>
-                <div class="">
-
-                    <router-link to="/settings"
-                                 type="button"
-                                 class="btn btn-dark text-light bottom-menu-item"
-                                 data-bs-placement="left"
-                                 title="Einstellungen">
-                        <i class="fas fa-sliders-h"></i>
-                    </router-link>
-                </div>
-            </div>
+        <div class="dropup left-menu-item">
+            <button class="btn btn-success text-light bottom-menu-item" type="button"
+                    id="create-dropdown-menu" data-bs-toggle="dropdown" aria-expanded="false" title="Neu">
+                <i class="fas fa-plus"></i>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="create-dropdown-menu">
+                <li>
+                    <button class="btn btn-light dropdown-menu-button" type="button"
+                            @click="createTracker()">Tracker
+                    </button>
+                </li>
+                <li>
+                    <button class="btn btn-light dropdown-menu-button" type="button"
+                            @click="createTimeBox()">Timebox
+                    </button>
+                </li>
+            </ul>
+        </div>
+        <div class="left-menu-item">
+            <router-link to="/"
+                         type="button"
+                         class="btn btn-dark text-light bottom-menu-item"
+                         data-bs-placement="left"
+                         title="Home">
+                <i class="fas fa-home"></i>
+            </router-link>
+        </div>
+        <div class="left-menu-item" v-if="$store.state.trackers.length > 0">
+            <router-link to="/trackers"
+                         type="button"
+                         class="btn btn-primary text-light bottom-menu-item"
+                         data-bs-placement="left"
+                         title="Alle Tracker">
+                <i class="fas fa-clock"></i>
+            </router-link>
+        </div>
+        <div class="left-menu-item" v-if="$store.state.archive.length > 0">
+            <router-link to="/archive"
+                         type="button"
+                         class="btn btn-warning bottom-menu-item"
+                         data-bs-placement="left"
+                         title="Archivierte Tracker">
+                <i class="fas fa-archive"></i>
+            </router-link>
+        </div>
+        <div class="left-menu-item" v-if="($store.state.trackers.length + $store.state.archive.length) > 0">
+            <a type="button"
+               class="btn btn-info text-light bottom-menu-item"
+               data-bs-toggle="offcanvas"
+               data-bs-target="#pastDaysModal"
+               data-bs-placement="top"
+               title="Buchungsverlauf">
+                <i class="fas fa-history"></i>
+            </a>
+        </div>
+        <div class="left-menu-item">
+            <router-link to="/settings"
+                         type="button"
+                         class="btn btn-dark text-light bottom-menu-item"
+                         data-bs-placement="left"
+                         title="Einstellungen">
+                <i class="fas fa-sliders-h"></i>
+            </router-link>
         </div>
     </div>
 </template>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 84afdc5..95d577e 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -1,15 +1,15 @@
 <template>
-    <h5 class="modal-title"><i class="fas fa-sliders-h"></i> Einstellungen</h5>
+    <h5><i class="fas fa-sliders-h"></i> Einstellungen</h5>
     <hr/>
     <div class="row">
         <div class="col-md-6">
             <h5>Allgemeine Einstellungen</h5>
+<!--            <div class="form-group">-->
+<!--                <label>Logo-Pfad</label>-->
+<!--                <input type="text" v-model="dashboardLogo" class="form-control">-->
+<!--            </div>-->
             <div class="form-group">
-                <label>Logo-Pfad</label>
-                <input type="text" v-model="dashboardLogo" class="form-control">
-            </div>
-            <div class="form-group">
-                <label>Tracker-Link <small>Link zu einem Tracker ohne Trackernummer</small></label>
+                <label>Ticket-Link <small>Link zu einem Ticket ohne Ticketnummer</small></label>
                 <input type="text" v-model="trackerSystemUrl" class="form-control">
             </div>
             <br/>
@@ -27,38 +27,38 @@
                 </label>
             </div>
             <br/>
-            <div class="form-group">
-                <label>Design</label>
-                <select v-model="theme" class="form-control">
-                    <option v-for="(availableTheme, themeIndex) in themes" :value="availableTheme.name.toLowerCase()"
-                            v-bind:key="themeIndex">{{ availableTheme.name }}
-                    </option>
-                </select>
-            </div>
-            <br/>
+<!--            <div class="form-group">-->
+<!--                <label>Design</label>-->
+<!--                <select v-model="theme" class="form-control">-->
+<!--                    <option v-for="(availableTheme, themeIndex) in themes" :value="availableTheme.name.toLowerCase()"-->
+<!--                            v-bind:key="themeIndex">{{ availableTheme.name }}-->
+<!--                    </option>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--            <br/>-->
         </div>
         <div class="col-md-6">
-            <h5>Zurücksetzen & Löschen</h5>
-            <div class="row">
-                <div class="col-md-6">
-                    <button class="btn btn-outline-danger btn-full-width" @click="deleteAllData()">Alle Daten
-                        löschen
-                    </button>
-                </div>
-            </div>
-            <br/>
+<!--            <h5>Zurücksetzen & Löschen</h5>-->
+<!--            <div class="row">-->
+<!--                <div class="col-md-6">-->
+<!--                    <button class="btn btn-outline-danger btn-full-width" @click="deleteAllData()">Alle Daten-->
+<!--                        löschen-->
+<!--                    </button>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <br/>-->
             <h5>Import & Export</h5>
             <div class="row">
                 <div class="col-md-6">
                     <h6>Export-Json</h6>
-                    <textarea class="form-control" rows="3" id="exportJsonInput" v-model="exportJson"></textarea>
-                    <button class="btn btn-success btn-full-width" @click="copy2Clipboard">Export-String kopieren
+                    <textarea class="form-control" id="exportJsonInput" v-model="exportJson"></textarea>
+                    <button class="btn btn-success tracker-action-button" @click="copy2Clipboard">Export-String kopieren
                     </button>
                 </div>
                 <div class="col-md-6">
                     <h6>Import</h6>
-                    <textarea class="form-control" rows="3" v-model="importJson"></textarea>
-                    <button class="btn btn-success btn-full-width" @click="importData">Import</button>
+                    <textarea class="form-control" v-model="importJson"></textarea>
+                    <button class="btn btn-success tracker-action-button" @click="importData">Import</button>
                 </div>
             </div>
         </div>
@@ -80,7 +80,7 @@ export default {
             importJson: '',
             theme: '',
             themes: null,
-            dashboardLogo: 'assets/img/logo.png',
+            // dashboardLogo: 'assets/img/logo.png',
             trackerSystemUrl: '',
             showPT: true,
             dontShowMinutes: false,
diff --git a/src/views/Switcher.vue b/src/views/Switcher.vue
deleted file mode 100644
index 26d59f9..0000000
--- a/src/views/Switcher.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-    <div class="modal fade" id="switcherModal" tabindex="-1" role="dialog" aria-labelledby="switcherModalLabel"
-         aria-hidden="true" v-if="">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-random"></i> Portal Switcher</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="row">
-                        <div class="col-12">
-                            <div class="form-group">
-                                <label class="text-muted">Portalname:</label>
-                                <input v-if="!portals || portals.length === 0" class="form-control" @change="updateStorage()" @keydown="updateStorage()" v-model="portal"/>
-                                <select v-else v-model="portal" class="form-control">
-                                    <option v-for="selectablePortal in portals" :value="selectablePortal">{{ selectablePortal }}</option>
-                                </select>
-                                <div class="form-group" v-if="experimental.portalSwitcher">
-                                    <label>
-                                        <input type="checkbox" class="form-control-checkbox" v-model="publicDB">
-                                        Auf Standard-DB wechseln?
-                                    </label>
-                                </div>
-                                <br/>
-                            </div>
-                        </div>
-                        <template v-if="portal && portal !== ''">
-                            <div class="col-12 switch-portal-button">
-                                <a class="btn btn-danger btn-switcher" href="javascript:" @click="sendPortalChangeRequest">
-                                    <i class="fas fa-random"></i> Wechsle Portal
-                                </a>
-                            </div>
-                            <div class="col">
-                                <a class="btn btn-info btn-switcher" href="https://my.vemap.docker" target="_blank">Docker</a>
-                            </div>
-                            <div class="col">
-                                <a class="btn btn-warning btn-switcher" :href="getPortalLink(true)" target="_blank">Test</a>
-                            </div>
-                            <div class="col">
-                                <a class="btn btn-success btn-switcher" :href="getPortalLink()" target="_blank">Live</a>
-                            </div>
-                        </template>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: "Switcher"
-}
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/TasksForTracker.vue b/src/views/TasksForTracker.vue
index 644ddd4..d7b3352 100644
--- a/src/views/TasksForTracker.vue
+++ b/src/views/TasksForTracker.vue
@@ -7,7 +7,7 @@
          aria-labelledby="showTrackerTasksModal"
          aria-hidden="true">
         <div class="offcanvas-header">
-            <h5 class="modal-title"><i class="fas fa-clock"></i> Tasks für {{ $store.state.selectedTracker.number }}</h5>
+            <h5><i class="fas fa-clock"></i> Tasks für {{ $store.state.selectedTracker.number }}</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div class="modal-body">
diff --git a/src/views/Trackers.vue b/src/views/Trackers.vue
index 0e1fd0a..0aef85d 100644
--- a/src/views/Trackers.vue
+++ b/src/views/Trackers.vue
@@ -294,6 +294,7 @@ export default {
             return number.indexOf('#') >= 0;
         },
         deleteTracker(index, archive = false) {
+            let component = this;
             this.$store.commit("deleteTracker", index, archive);
             let message = 'Tracker "' + this.$store.state.trashed.number + '" wurde gelöscht';
 
@@ -305,7 +306,8 @@ export default {
                         instance.hide({
                             transitionOut: 'fadeOutUp',
                             onClosing: function(){
-                                this.$store.commit('restoreTrashed');
+                                component.$store.commit('restoreTrashed');
+                                component.$store.commit('saveTrackers');
                             }
                         }, toast, 'buttonName');
                     }, true]
@@ -361,11 +363,6 @@ export default {
     margin-bottom: 1px;
 }
 
-.bg-timebox {
-    background-color: black;
-    color: white;
-}
-
 .bg-timebox input {
     color: white;
 }
diff --git a/src/views/TrackersDetail.vue b/src/views/TrackersDetail.vue
index 7764960..eee8baf 100644
--- a/src/views/TrackersDetail.vue
+++ b/src/views/TrackersDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <h5 class="modal-title"><i class="fas fa-clock"></i> Tracker</h5>
+        <h5><i class="fas fa-clock"></i> Tracker</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
     </div>
     <div class="row">