diff --git a/src/components/AddTrackModal.svelte b/src/components/AddTrackModal.svelte
index 5c37c22d..7f35b517 100644
--- a/src/components/AddTrackModal.svelte
+++ b/src/components/AddTrackModal.svelte
@@ -1,16 +1,10 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { onMount } from "svelte";
   let trackname_input;
   let trackname_input_value;
   let tracklength;
   export let modal_open;
-  onMount(() => {
-    // trackname_input.focus();
-  });
   function submit() {
-    console.log(trackname_input_value);
-    console.log(tracklength);
   }
 </script>
 
diff --git a/src/components/TracksEmptyState.svelte b/src/components/TracksEmptyState.svelte
index 18c41790..8037b1fa 100644
--- a/src/components/TracksEmptyState.svelte
+++ b/src/components/TracksEmptyState.svelte
@@ -1,14 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store.js";
-  import { TrackService } from "@odit/lfk-client-js";
   import AddTrackModal from "./AddTrackModal.svelte";
-  let tracks_promise = TrackService.trackControllerGetAll();
   let modal_open = false;
-  function getNewID() {
-    console.log("got new id");
-    return Date.now();
-  }
 </script>
 
 <div class="text-center items-center justify-center">
diff --git a/src/components/TracksOverview.svelte b/src/components/TracksOverview.svelte
index a4b6258b..91c16592 100644
--- a/src/components/TracksOverview.svelte
+++ b/src/components/TracksOverview.svelte
@@ -1,14 +1,25 @@
 <script>
   import { _ } from "svelte-i18n";
+  import AddTrackModal from "./AddTrackModal.svelte";
+  let modal_open = false;
   import Tracks from "./Tracks.svelte";
 </script>
 
 <section class="container py-10 mx-auto sm:px-2">
   <span class="mb-1 text-3xl font-extrabold leading-tight text-gray-900">
     Tracks
+    <button
+      on:click={() => {
+        modal_open = true;
+      }}
+      type="button"
+      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+      Create Track
+    </button>
   </span>
   <p class="mb-16 text-lg text-gray-500">
     configure the tracks/ min-max lap times
   </p>
   <Tracks />
 </section>
+<AddTrackModal bind:modal_open />