diff --git a/.idea/timetrack.iml b/.idea/timetrack.iml
index c956989..3ba46a9 100644
--- a/.idea/timetrack.iml
+++ b/.idea/timetrack.iml
@@ -4,5 +4,6 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="izitoast" level="application" />
   </component>
 </module>
\ No newline at end of file
diff --git a/css/app.css b/css/app.css
index 5d3c796..8a50672 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1,5 +1,4 @@
 body {
-    background-color: #e7e7e7;
     overflow-y: auto;
 }
 
diff --git a/index.html b/index.html
index f0ee5ed..51fd9fc 100644
--- a/index.html
+++ b/index.html
@@ -15,28 +15,12 @@
 
 <body>
 <div id="root">
-    <!-- Tracker-Display -->
+    <link rel="stylesheet" :href="'https://bootswatch.com/5/' + theme + '/bootstrap.min.css'">
+    <link rel="stylesheet" href="css/app.css">
+
+    <!-- Content -->
     <div class="container" id="content">
-        <link rel="stylesheet" :href="'https://bootswatch.com/5/' + theme + '/bootstrap.min.css'">
-        <link rel="stylesheet" href="css/app.css">
-<!--        <nav class="navbar navbar-expand-lg navbar-light bg-light">-->
-<!--            <a class="navbar-brand">-->
-<!--                <img :src="dashboardLogo" alt="logo" class="logo-nav float-end" v-if="dashboardLogo"/>-->
-<!--                <div v-if="experimental.trackWorktime">-->
-<!--                    <template v-if="worktimeTracker.tracking">-->
-<!--                        <i class="far fa-pause-circle"></i>-->
-<!--                        <i class="far fa-stop-circle" @click="stopTracking(worktimeTracker)"></i>-->
-<!--                    </template>-->
-<!--                    <template v-else>-->
-<!--                    <a href="javascript:" @click="startTracking(worktimeTracker)">-->
-<!--                        <i class="far fa-play-circle"></i>-->
-<!--                    </a>-->
-<!--                    </template>-->
-<!--                </div>-->
-<!--                <h5 class="brand-title">Timetrack</h5>-->
-<!--            </a>-->
-<!--        </nav>-->
-        <div class="row" v-if="!experimental.boardView || view === 'trackers'">
+        <div id="trackers" class="row" v-if="view === 'trackers'">
             <div class="col-md-12">
                 <div class="row">
                     <template v-for="(ticket, ticketIndex) in tickets">
@@ -130,12 +114,12 @@
                                                     <div class="col-12">
                                                         Minuten:
                                                     </div>
-<!--                                                    <div class="col">-->
-<!--                                                        <button type="button" class="btn btn-secondary ticket-action-button"-->
-<!--                                                                @click="startTimeBox(ticket, 1)">-->
-<!--                                                            <i class="far fa-play-circle"></i> 1-->
-<!--                                                        </button>-->
-<!--                                                    </div>-->
+                                                    <!--                                                    <div class="col">-->
+                                                    <!--                                                        <button type="button" class="btn btn-secondary ticket-action-button"-->
+                                                    <!--                                                                @click="startTimeBox(ticket, 1)">-->
+                                                    <!--                                                            <i class="far fa-play-circle"></i> 1-->
+                                                    <!--                                                        </button>-->
+                                                    <!--                                                    </div>-->
                                                     <div class="col">
                                                         <button type="button" class="btn btn-secondary ticket-action-button"
                                                                 @click="startTimeBox(ticket, 15)">
@@ -195,380 +179,415 @@
                 </div>
             </div>
         </div>
-        <div class="row" v-if="experimental.boardView && view === 'board'" id="board-view">
-            <div class="col-4 col-board-inner">
-                <h5>Todo</h5>
-                <template v-for="(ticket, ticketIndex) in tickets">
-                </template>
-            </div>
-            <div class="col-4 col-board-inner">
-                <h5>On hold</h5>
-                <template v-for="(ticket, ticketIndex) in tickets">
-                    <div class="card bg-gradient-secondary" v-if="ticket.status === 'onhold'">
-                        <div class="card-body">
-                            <div class="card-text">
-                                <input type="text"
-                                       v-model="ticket.number"
-                                       class="form-control trackingNameField"
-                                       @keydown="updateStorage()"/>
-
-                                <div class="ticket-time-info">
-                                    <div v-if="ticket.tracking === true">
-                                        <div class="text-danger font-weight-bolder float-end">
-                                            <div class="spinner-grow spinner-grow-sm" role="status">
-                                                <span class="sr-only">Tracking...</span>
+
+        <!-- Board View-->
+        <div id="board" class="col row" v-if="view === 'board'">
+                    <div class="col-4 col-board-inner">
+                        <h5>Todo</h5>
+                        <template v-for="(ticket, ticketIndex) in tickets">
+                        </template>
+                    </div>
+                    <div class="col-4 col-board-inner">
+                        <h5>On hold</h5>
+                        <template v-for="(ticket, ticketIndex) in tickets">
+                            <div class="card bg-gradient-secondary" v-if="ticket.status === 'onhold'">
+                                <div class="card-body">
+                                    <div class="card-text">
+                                        <input type="text"
+                                               v-model="ticket.number"
+                                               class="form-control trackingNameField"
+                                               @keydown="updateStorage()"/>
+
+                                        <div class="ticket-time-info">
+                                            <div v-if="ticket.tracking === true">
+                                                <div class="text-danger font-weight-bolder float-end">
+                                                    <div class="spinner-grow spinner-grow-sm" role="status">
+                                                        <span class="sr-only">Tracking...</span>
+                                                    </div>
+                                                    Tracking
+                                                </div>
                                             </div>
-                                            Tracking
                                         </div>
-                                    </div>
-                                </div>
 
-                                <div v-if="ticket.tracking === true" class="ticket-time-info">
-                                    <span class="float-end">{{ getTrackingStartTime(ticket) }}</span>
-                                    <span v-if="ticket.tracking === true">Gestartet: </span>
-                                    <br/>
-                                    <span class="float-end">{{ currentTrackingRunningFor(ticket) }}</span>
-                                    <span v-if="ticket.tracking === true">Läuft seit: </span>
-                                </div>
+                                        <div v-if="ticket.tracking === true" class="ticket-time-info">
+                                            <span class="float-end">{{ getTrackingStartTime(ticket) }}</span>
+                                            <span v-if="ticket.tracking === true">Gestartet: </span>
+                                            <br/>
+                                            <span class="float-end">{{ currentTrackingRunningFor(ticket) }}</span>
+                                            <span v-if="ticket.tracking === true">Läuft seit: </span>
+                                        </div>
 
-                                <div class="ticket-time-info">
-                                    <span class="float-end">{{ getTotalTime(ticket) }}</span>
-                                    <span class="current-ticket-info">Gesamt: </span>
-                                </div>
+                                        <div class="ticket-time-info">
+                                            <span class="float-end">{{ getTotalTime(ticket) }}</span>
+                                            <span class="current-ticket-info">Gesamt: </span>
+                                        </div>
 
-                                <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
-                                <span class="">Heute: </span>
+                                        <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
+                                        <span class="">Heute: </span>
 
-                                <div class="row">
-                                    <div class="col-md-12" v-if="!ticket.tracking">
-                                        <button type="button" class="btn btn-info ticket-action-button"
-                                                @click="startTracking(ticket)">
-                                            <i class="far fa-play-circle"></i>
-                                        </button>
-                                    </div>
+                                        <div class="row">
+                                            <div class="col-md-12" v-if="!ticket.tracking">
+                                                <button type="button" class="btn btn-info ticket-action-button"
+                                                        @click="startTracking(ticket)">
+                                                    <i class="far fa-play-circle"></i>
+                                                </button>
+                                            </div>
 
-                                    <div class="col-md-12" v-else>
-                                        <button type="button" class="btn btn-danger ticket-action-button"
-                                                @click="stopTracking(ticket)">
-                                            <i class="far fa-stop-circle"></i>
-                                        </button>
-                                    </div>
+                                            <div class="col-md-12" v-else>
+                                                <button type="button" class="btn btn-danger ticket-action-button"
+                                                        @click="stopTracking(ticket)">
+                                                    <i class="far fa-stop-circle"></i>
+                                                </button>
+                                            </div>
 
-                                    <div class="col-md-12">
-                                        <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
-                                                @click="archiveTracker(ticketIndex)" title="Archivieren">
-                                            <i class="fas fa-archive"></i>
-                                        </button>
+                                            <div class="col-md-12">
+                                                <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
+                                                        @click="archiveTracker(ticketIndex)" title="Archivieren">
+                                                    <i class="fas fa-archive"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                        </template>
                     </div>
-                </template>
-            </div>
-            <div class="col-4">
-                <h5>Work in progress</h5>
-                <template v-for="(ticket, ticketIndex) in tickets">
-                    <div class="card bg-gradient-secondary" v-if="ticket.status === 'wip'">
-                        <div class="card-body">
-                            <div class="card-text">
-                                <input type="text"
-                                       v-model="ticket.number"
-                                       class="form-control trackingNameField"
-                                       @keydown="updateStorage()"/>
-
-                                <div class="ticket-time-info">
-                                    <div v-if="ticket.tracking === true">
-                                        <div class="text-danger font-weight-bolder float-end">
-                                            <div class="spinner-grow spinner-grow-sm" role="status">
-                                                <span class="sr-only">Tracking...</span>
+                    <div class="col-4">
+                        <h5>Work in progress</h5>
+                        <template v-for="(ticket, ticketIndex) in tickets">
+                            <div class="card bg-gradient-secondary" v-if="ticket.status === 'wip'">
+                                <div class="card-body">
+                                    <div class="card-text">
+                                        <input type="text"
+                                               v-model="ticket.number"
+                                               class="form-control trackingNameField"
+                                               @keydown="updateStorage()"/>
+
+                                        <div class="ticket-time-info">
+                                            <div v-if="ticket.tracking === true">
+                                                <div class="text-danger font-weight-bolder float-end">
+                                                    <div class="spinner-grow spinner-grow-sm" role="status">
+                                                        <span class="sr-only">Tracking...</span>
+                                                    </div>
+                                                    Tracking
+                                                </div>
                                             </div>
-                                            Tracking
                                         </div>
-                                    </div>
-                                </div>
 
-                                <div v-if="ticket.tracking === true" class="ticket-time-info">
-                                    <span class="float-end">{{ getTrackingStartTime(ticket) }}</span>
-                                    <span v-if="ticket.tracking === true">Gestartet: </span>
-                                    <br/>
-                                    <span class="float-end">{{ currentTrackingRunningFor(ticket) }}</span>
-                                    <span v-if="ticket.tracking === true">Läuft seit: </span>
-                                </div>
+                                        <div v-if="ticket.tracking === true" class="ticket-time-info">
+                                            <span class="float-end">{{ getTrackingStartTime(ticket) }}</span>
+                                            <span v-if="ticket.tracking === true">Gestartet: </span>
+                                            <br/>
+                                            <span class="float-end">{{ currentTrackingRunningFor(ticket) }}</span>
+                                            <span v-if="ticket.tracking === true">Läuft seit: </span>
+                                        </div>
 
-                                <div class="ticket-time-info">
-                                    <span class="float-end">{{ getTotalTime(ticket) }}</span>
-                                    <span class="current-ticket-info">Gesamt: </span>
-                                </div>
+                                        <div class="ticket-time-info">
+                                            <span class="float-end">{{ getTotalTime(ticket) }}</span>
+                                            <span class="current-ticket-info">Gesamt: </span>
+                                        </div>
 
-                                <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
-                                <span class="">Heute: </span>
+                                        <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
+                                        <span class="">Heute: </span>
 
-                                <div class="row">
-                                    <div class="col-md-12" v-if="!ticket.tracking">
-                                        <button type="button" class="btn btn-info ticket-action-button"
-                                                @click="startTracking(ticket)">
-                                            <i class="far fa-play-circle"></i>
-                                        </button>
-                                    </div>
+                                        <div class="row">
+                                            <div class="col-md-12" v-if="!ticket.tracking">
+                                                <button type="button" class="btn btn-info ticket-action-button"
+                                                        @click="startTracking(ticket)">
+                                                    <i class="far fa-play-circle"></i>
+                                                </button>
+                                            </div>
 
-                                    <div class="col-md-12" v-else>
-                                        <button type="button" class="btn btn-danger ticket-action-button"
-                                                @click="stopTracking(ticket)">
-                                            <i class="far fa-stop-circle"></i>
-                                        </button>
-                                    </div>
+                                            <div class="col-md-12" v-else>
+                                                <button type="button" class="btn btn-danger ticket-action-button"
+                                                        @click="stopTracking(ticket)">
+                                                    <i class="far fa-stop-circle"></i>
+                                                </button>
+                                            </div>
 
-                                    <div class="col-md-12">
-                                        <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
-                                                @click="archiveTracker(ticketIndex)" title="Archivieren">
-                                            <i class="fas fa-archive"></i>
-                                        </button>
+                                            <div class="col-md-12">
+                                                <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
+                                                        @click="archiveTracker(ticketIndex)" title="Archivieren">
+                                                    <i class="fas fa-archive"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
+                        </template>
                     </div>
-                </template>
-            </div>
-        </div>
     </div>
+        <!-- Trackers-Detail -->
+        <!-- TODO: Merge to main Trackers-page -->
+        <div id="trackersDetail" class="col-md-auto row" v-if="view === 'trackersDetail'">
+            <template v-for="(ticket, ticketIndex) in tickets">
+                <div class="col-md-6">
+                    <h6><span v-if="isTicketNumber(ticket.number)"></span>{{ ticket.number }}</h6>
 
-    <!-- Tickets Modal -->
-    <div class="modal modal-fullscreen fade" id="showTicketsModal" tabindex="-1" role="dialog"
-         aria-labelledby="showTicketsModalLabel"
-         aria-hidden="true">
-        <div class="modal-dialog showTicketsModalDialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><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="modal-body">
-                    <div class="row">
-                        <template v-for="(ticket, ticketIndex) in tickets">
-                            <div class="col-md-6">
-                                <h6><span v-if="isTicketNumber(ticket.number)"></span>{{ ticket.number }}</h6>
-
-                                <div class="form-group">
-                                    <input type="text" class="form-control" v-model="ticket.description" @keydown="updateStorage()" placeholder="Beschreibung">
-                                </div>
-
-                                <span v-if="getTotalTime(ticket) > 0">Gesamtzeit: {{getTotalTime(ticket)}}</span>
-                                <br>
-                                <div class="row">
-                                    <div class="col">
-                                        <button class="btn btn-info ticket-action-button"
-                                                @click="showCustomBookingForTracker(ticket)"
-                                                title="Manuelle Buchung">
-                                            <i class="fas fa-user-edit"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col">
-                                        <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
-                                                @click="archiveTracker(ticketIndex)" title="Archivieren">
-                                            <i class="fas fa-archive"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col" v-if="ticket.history.length > 0">
-                                        <button class="btn btn-info ticket-action-button" data-bs-dismiss="modal"
-                                                @click="showHistoryForTracker(ticket)" title="History">
-                                            <i class="fas fa-history"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col">
-                                        <button class="btn btn-danger ticket-action-button"
-                                                @click="deleteTracker(ticketIndex)" title="Löschen">
-                                            <i class="fas fa-trash"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col" v-if="ticketSystemUrl">
-                                        <a v-if="isTicketNumber(ticket.number)" :href="ticketSystemUrl + ticket.number.replace('#', '')"
-                                           target="_blank" class="btn btn-dark ticket-action-button" title="Ticket">
-                                            <i class="fas fa-external-link-square-alt"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <br/>
-                            </div>
-                        </template>
+                    <div class="form-group">
+                        <input type="text" class="form-control" v-model="ticket.description" @keydown="updateStorage()" placeholder="Beschreibung">
                     </div>
-                </div>
-            </div>
-        </div>
-    </div>
 
-    <!-- Archive Modal -->
-    <div class="modal modal-fullscreen fade" id="showArchivedTicketsModal" tabindex="-1" role="dialog"
-         aria-labelledby="showArchivedTicketsModalLabel"
-         aria-hidden="true">
-        <div class="modal-dialog showArchivedTicketsModalDialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-archive"></i> Archivierte Tracker</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
+                    <span v-if="getTotalTime(ticket) > 0">Gesamtzeit: {{getTotalTime(ticket)}}</span>
+                    <br>
                     <div class="row">
-                        <div class="col-sm-6"></div>
-                        <div class="col-sm-6">
-                            <i class="fas fa-search"></i>
-                            <input @keydown="$forceUpdate()" type="text" class="form-control search-field float-right" v-model="searchQuery" placeholder="Suche..">
+                        <div class="col">
+                            <button class="btn btn-info ticket-action-button"
+                                    @click="showCustomBookingForTracker(ticket)"
+                                    title="Manuelle Buchung">
+                                <i class="fas fa-user-edit"></i>
+                            </button>
+                        </div>
+                        <div class="col">
+                            <button class="btn btn-secondary ticket-action-button" data-bs-dismiss="modal"
+                                    @click="archiveTracker(ticketIndex)" title="Archivieren">
+                                <i class="fas fa-archive"></i>
+                            </button>
+                        </div>
+                        <div class="col" v-if="ticket.history.length > 0">
+                            <button class="btn btn-info ticket-action-button" data-bs-dismiss="modal"
+                                    @click="showHistoryForTracker(ticket)" title="History">
+                                <i class="fas fa-history"></i>
+                            </button>
+                        </div>
+                        <div class="col">
+                            <button class="btn btn-danger ticket-action-button"
+                                    @click="deleteTracker(ticketIndex)" title="Löschen">
+                                <i class="fas fa-trash"></i>
+                            </button>
+                        </div>
+                        <div class="col" v-if="ticketSystemUrl">
+                            <a v-if="isTicketNumber(ticket.number)" :href="ticketSystemUrl + ticket.number.replace('#', '')"
+                               target="_blank" class="btn btn-dark ticket-action-button" title="Ticket">
+                                <i class="fas fa-external-link-square-alt"></i>
+                            </a>
                         </div>
-                        <template v-for="(ticket, ticketIndex) in archive">
-                            <div class="col-md-6" v-if="searchQuery === '' || ticket.number.search(searchQuery) >= 0 || (ticket.description && ticket.description.search(searchQuery)) >= 0">
-                                <h6><span v-if="isTicketNumber(ticket.number)"></span>{{ ticket.number }}</h6>
-                                <div v-if="ticket.description">
-                                    <p class="fst-italic">{{ ticket.description }}</p>
-                                </div>
-                                <div class="ticket-time-info">
-                                    <span class="float-end">{{ getTotalTime(ticket) }}</span>
-                                    <span class="current-ticket-info">Gesamt: </span>
-                                </div>
-
-                                <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
-                                <span class="">Heute: </span>
-
-                                <br>
-                                <div class="row">
-                                    <div class="col">
-                                        <button class="btn btn-success ticket-action-button" data-bs-dismiss="modal"
-                                                @click="reactivateTicket(ticketIndex)" title="Reaktivieren">
-                                            <i class="fas fa-power-off"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col" v-if="ticket.history.length > 0">
-                                        <button class="btn btn-info ticket-action-button" data-bs-dismiss="modal"
-                                                @click="showHistoryForTracker(ticket)" title="History">
-                                            <i class="fas fa-history"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col">
-                                        <button class="btn btn-danger ticket-action-button"
-                                                @click="deleteTracker(ticketIndex, true)" title="Löschen">
-                                            <i class="fas fa-trash"></i>
-                                        </button>
-                                    </div>
-                                    <div class="col" v-if="ticketSystemUrl">
-                                        <a v-if="isTicketNumber(ticket.number)" :href="ticketSystemUrl + ticket.number.replace('#', '')"
-                                           target="_blank" class="btn btn-dark ticket-action-button" title="Ticket">
-                                            <i class="fas fa-external-link-square-alt"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <br/>
-                            </div>
-                        </template>
                     </div>
+                    <br/>
                 </div>
-            </div>
+            </template>
         </div>
-    </div>
+        <!-- Archive -->
+        <div id="archive" class="col-md-auto row" v-if="view === 'archive'">
+            <div class="col-sm-6">
+                <i class="fas fa-search"></i>
+                <input @keydown="$forceUpdate()" type="text" class="form-control search-field float-right" v-model="searchQuery" placeholder="Suche..">
+            </div>
+            <div class="col-sm-6"></div>
+            <template v-for="(ticket, ticketIndex) in archive">
+                <div class="col-md-6" v-if="searchQuery === '' || ticket.number.search(searchQuery) >= 0 || (ticket.description && ticket.description.search(searchQuery)) >= 0">
+                    <h6><span v-if="isTicketNumber(ticket.number)"></span>{{ ticket.number }}</h6>
+                    <div v-if="ticket.description">
+                        <p class="fst-italic">{{ ticket.description }}</p>
+                    </div>
+                    <div class="ticket-time-info">
+                        <span class="float-end">{{ getTotalTime(ticket) }}</span>
+                        <span class="current-ticket-info">Gesamt: </span>
+                    </div>
 
-    <!-- Settings Modal -->
-    <div class="modal fade" id="settingsModal" tabindex="-1" role="dialog" aria-labelledby="settingsModalLabel"
-         aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-sliders-h"></i> Einstellungen</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body 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>Ticket-Link <small>Link zu einem Ticket ohne Ticketnummer</small></label>
-                            <input type="text" v-model="ticketSystemUrl" class="form-control">
-                        </div>
-                        <br/>
-                        <div class="form-group">
-                            <label>
-                                <input type="checkbox" class="form-control-checkbox" v-model="showPT">
-                                Ab 8 Stunden nurmehr PT anzeigen
-                            </label>
-                        </div>
-                        <br/>
-                        <div class="form-group">
-                            <label>
-                                <input type="checkbox" class="form-control-checkbox" v-model="dontShowMinutes">
-                                Zeit immer in Stunden anzeigen
-                            </label>
+                    <span class="float-end">{{ getTotalTimeToday(ticket) }}</span>
+                    <span class="">Heute: </span>
+
+                    <br>
+                    <div class="row">
+                        <div class="col">
+                            <button class="btn btn-success ticket-action-button" data-bs-dismiss="modal"
+                                    @click="reactivateTicket(ticketIndex)" title="Reaktivieren">
+                                <i class="fas fa-power-off"></i>
+                            </button>
                         </div>
-                        <br/>
-                        <div class="form-group">
-                            <label>
-                                <input type="checkbox" class="form-control-checkbox" v-model="fun">
-                                Secret Features
-                            </label>
+                        <div class="col" v-if="ticket.history.length > 0">
+                            <button class="btn btn-info ticket-action-button" data-bs-dismiss="modal"
+                                    @click="showHistoryForTracker(ticket)" title="History">
+                                <i class="fas fa-history"></i>
+                            </button>
                         </div>
-                        <br/>
-                        <div class="form-group">
-                            <label>Design</label>
-                            <select v-model="theme" class="form-control">
-                                <option v-for="availableTheme in themes" :value="availableTheme.name.toLowerCase()">{{ availableTheme.name }}</option>
-                            </select>
+                        <div class="col">
+                            <button class="btn btn-danger ticket-action-button"
+                                    @click="deleteTracker(ticketIndex, true)" title="Löschen">
+                                <i class="fas fa-trash"></i>
+                            </button>
                         </div>
-                        <br/>
-                        <div class="form-group" v-if="experimental.portalSwitcher">
-                            <label>Portalnamen <a class="text-muted" href="https://settings.vemap.docker/?fetchPortals" target="_blank">(Import-String hier)</a></label>
-                            <input v-model="importStringForPortals" class="form-control"/>
-                            <a href="javascript:" @click="importPortalsJson" class="btn" v-if="this.importStringForPortals !== ''">Import</a>
+                        <div class="col" v-if="ticketSystemUrl">
+                            <a v-if="isTicketNumber(ticket.number)" :href="ticketSystemUrl + ticket.number.replace('#', '')"
+                               target="_blank" class="btn btn-dark ticket-action-button" title="Ticket">
+                                <i class="fas fa-external-link-square-alt"></i>
+                            </a>
                         </div>
-                        <br/>
+                    </div>
+                    <br/>
+                </div>
+            </template>
+        </div>
+        <!-- Settings -->
+        <div id="settings" class="col-md-auto row" v-if="view === 'settings'">
+            <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>Ticket-Link <small>Link zu einem Ticket ohne Ticketnummer</small></label>
+                    <input type="text" v-model="ticketSystemUrl" class="form-control">
+                </div>
+                <br/>
+                <div class="form-group">
+                    <label>
+                        <input type="checkbox" class="form-control-checkbox" v-model="showPT">
+                        Ab 8 Stunden nurmehr PT anzeigen
+                    </label>
+                </div>
+                <br/>
+                <div class="form-group">
+                    <label>
+                        <input type="checkbox" class="form-control-checkbox" v-model="dontShowMinutes">
+                        Zeit immer in Stunden anzeigen
+                    </label>
+                </div>
+                <br/>
+                <div class="form-group">
+                    <label>
+                        <input type="checkbox" class="form-control-checkbox" v-model="fun">
+                        Secret Features
+                    </label>
+                </div>
+                <br/>
+                <div class="form-group">
+                    <label>Design</label>
+                    <select v-model="theme" class="form-control">
+                        <option v-for="availableTheme in themes" :value="availableTheme.name.toLowerCase()">{{ availableTheme.name }}</option>
+                    </select>
+                </div>
+                <br/>
+                <div class="form-group" v-if="experimental.portalSwitcher">
+                    <label>Portalnamen <a class="text-muted" href="https://settings.vemap.docker/?fetchPortals" target="_blank">(Import-String hier)</a></label>
+                    <input v-model="importStringForPortals" class="form-control"/>
+                    <a href="javascript:" @click="importPortalsJson" class="btn" v-if="this.importStringForPortals !== ''">Import</a>
+                </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-warning btn-full-width" @click="resetToDefault()">
+                            Zurücksetzen
+                        </button>
                     </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-warning btn-full-width" @click="resetToDefault()">
-                                    Zurücksetzen
-                                </button>
-                            </div>
-                            <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">{{ exportJson }}</textarea>
-                                <button class="btn btn-success btn-full-width" @click="copy2Clipboard">Export-String kopieren</button>
-                            </div>
-                            <div class="col-md-6">
-                                <h6>Import</h6>
-                                <textarea class="form-control" rows="3" v-model="inputs.importJson"></textarea>
-                                <button class="btn btn-success btn-full-width" @click="importData">Import</button>
-                            </div>
-                        </div>
+                        <button class="btn btn-outline-danger btn-full-width" @click="deleteAllData()">Alle Daten
+                            löschen
+                        </button>
                     </div>
                 </div>
-                <div class="modal-footer">
-                    <button class="btn btn-primary" v-on:click="updateStorage()" data-bs-dismiss="modal">Speichern</button>
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Schließen</button>
+                <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">{{ exportJson }}</textarea>
+                        <button class="btn btn-success btn-full-width" @click="copy2Clipboard">Export-String kopieren</button>
+                    </div>
+                    <div class="col-md-6">
+                        <h6>Import</h6>
+                        <textarea class="form-control" rows="3" v-model="inputs.importJson"></textarea>
+                        <button class="btn btn-success btn-full-width" @click="importData">Import</button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-
-    <!-- History Modal -->
-    <div class="modal fade" id="historyModal" tabindex="-1" role="dialog" aria-labelledby="historyModalLabel"
-         aria-hidden="true" v-if="selectedTracker">
-        <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 {{ selectedTracker.number }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        <!-- Custom Booking-->
+        <div id="customBooking" class="col-md-auto row" v-if="view === 'customBooking' && selectedTracker">
+            <div class="form-group">
+                <label>Zeit in Minuten:</label>
+                <input type="text" class="form-control" v-model="customBookingValue">
+            </div>
+            <div class="row">
+                <div class="col-6">
+                    <a href="javascript:" class="btn btn-success btn-full-width" data-bs-dismiss="modal" @click="makeCustomBooking()">+ Hinzubuchen</a>
+                </div>
+                <div class="col-6">
+                    <a href="javascript:" class="btn btn-danger btn-full-width" data-bs-dismiss="modal" @click="makeCustomBooking(true)">- Abbuchen</a>
+                </div>
+            </div>
+        </div>
+        <!-- Switcher -->
+        <div id="switcher" class="col-md-auto row" v-if="view === 'switcher'">
+            <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>
-                <div class="modal-body">
+            </template>
+        </div>
+        <!-- Past Days-->
+        <div id="pastDays" class="col-md-auto row" v-if="view === 'pastDays'">
+            <div class="col-12">
+                <div class="form-group">
+                    <div class="form-group">
+                        <h6 for="date">Datum</h6>
+                        <input id="date" type="date" class="form-control" v-model="customDateForPastDays">
+                    </div>
+                    <ul class="list-group">
+                        <li class="list-group-item" v-for="entry in collectDataForDay(0, customDateForPastDays)" :style="entry.archive ? 'background-color: lightgrey;' : ''">
+                            {{ entry.ticket }}
+                            <span class="float-end">{{ timeWithPostFix(entry.minutes) }}</span>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <!-- Snippet Space-->
+        <div id="snippetSpace" class="col-md-auto row" v-if="view === 'snippetSpace'">
+                <div class="col-12">
+                    <a href="javascript:" class="btn btn-sm btn-success btn-wide float-end" @click="createSnippet()">
+                        <i class="fas fa-plus"></i>
+                    </a>
+                </div>
+                <div class="col-lg-6" v-for="(snippet, snippetIndex) in snippets">
+                    <textarea class="snippet-space-item" :id="snippet.id" v-model="snippet.content" @load="loadSnippet(snippet)"></textarea>
+                    <div class="float-end">
+                        <a href="javascript:" class="btn btn-sm btn-warning btn-wide" @click="copySnippet(snippet)">
+                            <i class="fas fa-copy"></i>
+                        </a>
+                        <a href="javascript:" class="btn btn-sm btn-danger btn-wide" @click="deleteSnippet(snippetIndex)">
+                            <i class="fas fa-trash"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        <div class="col-6 card" v-if="showHistory">
+            <div class="card-body">
+                <!-- History -->
+                <div class="row">
                     <ul class="list-group ticket-history">
                         <template v-for="(tracker, historyIndex) in selectedTracker.history">
                             <li class="list-group-item" v-if="!tracker.manually">
@@ -623,146 +642,6 @@
         </div>
     </div>
 
-    <!-- Custom Booking Modal -->
-    <div class="modal fade" id="customBookingModal" tabindex="-1" role="dialog" aria-labelledby="customBookingModalLabel"
-         aria-hidden="true" v-if="selectedTracker">
-        <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>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label>Zeit in Minuten:</label>
-                        <input type="text" class="form-control" v-model="customBookingValue">
-                    </div>
-                    <div class="row">
-                        <div class="col-6">
-                            <a href="javascript:" class="btn btn-success btn-full-width" data-bs-dismiss="modal" @click="makeCustomBooking()">+ Hinzubuchen</a>
-                        </div>
-                        <div class="col-6">
-                            <a href="javascript:" class="btn btn-danger btn-full-width" data-bs-dismiss="modal" @click="makeCustomBooking(true)">- Abbuchen</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Switcher Modal -->
-    <div class="modal fade" id="switcherModal" tabindex="-1" role="dialog" aria-labelledby="switcherModalLabel"
-         aria-hidden="true" v-if="experimental.portalSwitcher">
-        <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>
-
-    <!-- Past Days Modal -->
-    <div class="modal fade" id="pastDaysModal" tabindex="-1" role="dialog" aria-labelledby="pastDaysModalLabel"
-         aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-random"></i> Buchungsverlauf</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">
-                                <div class="form-group">
-                                    <h6 for="date">Datum</h6>
-                                    <input id="date" type="date" class="form-control" v-model="customDateForPastDays">
-                                </div>
-                                <ul class="list-group">
-                                    <li class="list-group-item" v-for="entry in collectDataForDay(0, customDateForPastDays)" :style="entry.archive ? 'background-color: lightgrey;' : ''">
-                                        {{ entry.ticket }}
-                                        <span class="float-end">{{ timeWithPostFix(entry.minutes) }}</span>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- SnippetSpace Modal -->
-    <div class="modal fade" id="snippetSpaceModal" tabindex="-1" role="dialog" aria-labelledby="snippetSpaceModalLabel"
-         aria-hidden="true" v-if="experimental.snippetSpace">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title"><i class="fas fa-code"></i> Snippet Space</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">
-                            <a href="javascript:" class="btn btn-sm btn-success btn-wide float-end" @click="createSnippet()">
-                                <i class="fas fa-plus"></i>
-                            </a>
-                        </div>
-                        <div class="col-lg-6" v-for="(snippet, snippetIndex) in snippets">
-                            <textarea class="snippet-space-item" :id="snippet.id" v-model="snippet.content" @load="loadSnippet(snippet)"></textarea>
-                            <div class="float-end">
-                                <a href="javascript:" class="btn btn-sm btn-warning btn-wide" @click="copySnippet(snippet)">
-                                    <i class="fas fa-copy"></i>
-                                </a>
-                                <a href="javascript:" class="btn btn-sm btn-danger btn-wide" @click="deleteSnippet(snippetIndex)">
-                                    <i class="fas fa-trash"></i>
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <!-- Menu section -->
     <div id="left-menu">
         <div class="container">
@@ -773,17 +652,35 @@
                             <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>
+                            <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>
+                    <a type="button"
+                       class="btn btn-dark text-light bottom-menu-item"
+                       v-on:click="view = 'trackers'"
+                       title="Alle Tracker">
+                        <i class="fas fa-home"></i>
+                    </a>
+                </div>
+                <div>
+                    <a type="button"
+                       class="btn btn-dark text-light bottom-menu-item"
+                       v-on:click="view = 'board'"
+                       title="Alle Tracker">
+                        <i class="fas fa-clipboard-check"></i>
+                    </a>
+                </div>
                 <div class="" v-if="tickets.length > 0">
                     <a type="button"
                        class="btn btn-primary text-light bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#showTicketsModal"
-                       data-bs-placement="top"
+                       v-on:click="view = 'trackersDetail'"
                        title="Alle Tracker">
                         <i class="fas fa-clock"></i>
                     </a>
@@ -791,9 +688,7 @@
                 <div class="" v-if="archive.length > 0">
                     <a type="button"
                        class="btn btn-secondary text-dark bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#showArchivedTicketsModal"
-                       data-bs-placement="top"
+                       v-on:click="view = 'archive'"
                        title="Archivierte Tracker">
                         <i class="fas fa-archive"></i>
                     </a>
@@ -801,9 +696,7 @@
                 <div class="" v-if="experimental.portalSwitcher">
                     <a type="button"
                        class="btn btn-warning text-light bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#switcherModal"
-                       data-bs-placement="top"
+                       v-on:click="view = 'switcher'"
                        title="Portal Switcher">
                         <i class="fas fa-random"></i>
                     </a>
@@ -811,9 +704,7 @@
                 <div class="" v-if="experimental.snippetSpace">
                     <a type="button"
                        class="btn btn-info text-light bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#snippetSpaceModal"
-                       data-bs-placement="top"
+                       v-on:click="view = 'snippetSpace'"
                        title="Snippet Space">
                         <i class="fas fa-code"></i>
                     </a>
@@ -821,9 +712,7 @@
                 <div class="">
                     <a type="button"
                        class="btn btn-info text-light bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#pastDaysModal"
-                       data-bs-placement="top"
+                       v-on:click="view = 'pastDays'"
                        title="Buchungsverlauf">
                         <i class="fas fa-history"></i>
                     </a>
@@ -831,9 +720,7 @@
                 <div class="">
                     <a type="button"
                        class="btn btn-dark text-light bottom-menu-item"
-                       data-bs-toggle="modal"
-                       data-bs-target="#settingsModal"
-                       data-bs-placement="left"
+                       v-on:click="view = 'settings'"
                        title="Einstellungen">
                         <i class="fas fa-sliders-h"></i>
                     </a>
@@ -841,13 +728,6 @@
             </div>
         </div>
     </div>
-
-    <template v-if="fun">
-        <div id="hidden-one" @click="tellJoke('pun', 'de')"></div>
-        <div id="hidden-two" @click="tellJoke('programming,coding,development')"></div>
-        <div id="hidden-three" @click="tellJoke('dark')"></div>
-        <div id="hidden-four" @click="tellJoke('misc')"></div>
-    </template>
 </div>
 
 <script src="js/codemirror.js"></script>
diff --git a/js/app.js b/js/app.js
index eae48c3..185df91 100644
--- a/js/app.js
+++ b/js/app.js
@@ -7,7 +7,8 @@ const TimeTrack = {
                 snippetSpace: false,
                 portalSwitcher: true
             },
-            view: 'board',
+            view: 'trackers',
+            showHistory: false,
             theme: 'materia',
             themes: null,
             dashboardLogo: 'assets/img/logo.png',
@@ -348,7 +349,8 @@ const TimeTrack = {
 
             iziToast.show({
                 message: message,
-                color: 'blue'
+                color: 'blue',
+                position: 'topCenter'
             });
 
             this.updateStorage();
@@ -358,11 +360,18 @@ const TimeTrack = {
                 this.stopActiveTracker();
             }
 
+            iziToast.show({
+                title: 'Tracker archiviert',
+                color: 'green',
+                position: 'topCenter'
+            });
+
             this.archive.push(this.tickets[index]);
             this.tickets.splice(index, 1);
             this.updateStorage();
         },
         reactivateTicket(index) {
+            this.view = 'trackers';
             this.tickets.push(this.archive[index]);
             this.archive.splice(index, 1);
             this.updateStorage();
@@ -443,6 +452,7 @@ const TimeTrack = {
         },
         showHistoryForTracker(ticket) {
             this.selectedTracker = ticket;
+            this.showHistory = true;
             this.$forceUpdate();
             setTimeout(() => {
                 let historyModal = new bootstrap.Modal(document.getElementById('historyModal'));
