diff --git a/appinfo/info.xml b/appinfo/info.xml
index a844439..45c38f9 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -35,7 +35,7 @@ Mit dem integrierten Dashboard lässt sich anhand eines Kuchen-/Donut-Diagramms
 
 Diese App wird aktuell noch weiterentwickelt, also: Augen offen halten für neue Features! Und falls Dir irgendwelche Verbesserungsvorschläge, Probleme oder neue Features einfallen, schau mal auf unserem [GitHub Projekt](https://github.com/mtierltd/timetracker) vorbei, vielleicht wird Dein Thema bereits diskutiert! Und falls nicht, starte gerne eine neue Diskussion, wir freuen uns auf Dein Feedback!
     </description>
-    <version>0.0.86</version>
+    <version>0.0.87</version>
     <licence>agpl</licence>
     <author mail="info@mtier.org" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>
@@ -53,7 +53,7 @@ Diese App wird aktuell noch weiterentwickelt, also: Augen offen halten für neue
     <screenshot>https://abload.de/img/bildschirmfotoam2021-vuk8t.png</screenshot>
     <screenshot>https://abload.de/img/bildschirmfotoam2021-03kxw.png</screenshot>
     <dependencies>
-        <nextcloud min-version="20" max-version="33"/>
+        <nextcloud min-version="20" max-version="34"/>
     </dependencies>
     <navigations>
         <navigation>
diff --git a/css/style.css b/css/style.css
index e3c356a..5fe5fb6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -17,12 +17,30 @@
 	width: 100%;
 	display: flex;
     flex-direction: row;
+	align-items: center;
 }
 #top-work-bar-right {
 	/* width: 100%; */
 	/* background-color: aqua; */
 	/* min-width:240px; */
 	display: flex;
+	align-items: center;
+	flex-shrink: 0;
+}
+#start-tracking {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 36px;
+	height: 36px;
+	padding: 0;
+	flex-shrink: 0;
+}
+#start-tracking .my-icon {
+	position: static;
+	margin: 0;
+	top: auto;
+	left: auto;
 }
 
 #app {
diff --git a/templates/navigation/index.php b/templates/navigation/index.php
index 6217972..8a1d4c4 100644
--- a/templates/navigation/index.php
+++ b/templates/navigation/index.php
@@ -1,13 +1,14 @@
+<?php $urlGenerator = \OC::$server->get(\OCP\IURLGenerator::class); ?>
 <ul class="with-icon">
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.page.index'));?>" class='nav-icon-timer svg'>Timer</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.dashboard.index'));?>" class='nav-icon-dashboard svg'>Dashboard</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.goals.index'));?>" class='nav-icon-goals svg'>Goals</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.reports.index'));?>"" class='nav-icon-reports svg'>Reports</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.timelines.index'));?>"" class='nav-icon-reports svg'>Timelines</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.page.index'));?>" class='nav-icon-timer svg'>Timer</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.dashboard.index'));?>" class='nav-icon-dashboard svg'>Dashboard</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.goals.index'));?>" class='nav-icon-goals svg'>Goals</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.reports.index'));?>" class='nav-icon-reports svg'>Reports</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.timelines.index'));?>" class='nav-icon-reports svg'>Timelines</a></li>
 	<?php if (\OC_User::isAdminUser(\OC_User::getUser())): ?>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.timelinesAdmin.index'));?>"" class='nav-icon-reports svg'>Timelines Admin</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.timelinesAdmin.index'));?>" class='nav-icon-reports svg'>Timelines Admin</a></li>
 	<?php endif; ?>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.projects.index'));?>" class='nav-icon-projects svg'>Projects</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.clients.index'));?>" class='nav-icon-clients svg'>Clients</a></li>
-	<li><a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('timetracker.tags.index'));?>" class='nav-icon-tags svg'>Tags</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.projects.index'));?>" class='nav-icon-projects svg'>Projects</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.clients.index'));?>" class='nav-icon-clients svg'>Clients</a></li>
+	<li><a href="<?php p($urlGenerator->linkToRoute('timetracker.tags.index'));?>" class='nav-icon-tags svg'>Tags</a></li>
 </ul>