diff --git a/src/pages/event/EventEdit.svelte b/src/pages/event/EventEdit.svelte
index 166bebc..c8dfa53 100644
--- a/src/pages/event/EventEdit.svelte
+++ b/src/pages/event/EventEdit.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
     import type {ExtendedEvent} from "../../types/event.js";
-    import {Button, Heading, Input, Label, Modal, Range, Select, Toggle} from "flowbite-svelte";
+    import {Button, Heading, Input, Label, Modal, Range, Select, Toast, Toggle} from "flowbite-svelte";
     import {schemTypes} from "../../stores/stores.js";
     import moment from "moment/moment.js";
     import type {UpdateEvent} from "../../repo/event.js";
     import {eventRepo} from "../../repo/repo.js";
     import ErrorModal from "../../components/ErrorModal.svelte";
     import {replace} from "svelte-spa-router";
+    import {CheckCircleOutline} from "flowbite-svelte-icons";
 
     export let data: ExtendedEvent;
     let event = data.event;
@@ -55,6 +56,8 @@
         }
     }
 
+    let successToast: boolean = false;
+
     async function update() {
         let ev: UpdateEvent = {
             deadline: deadlineDate,
@@ -69,6 +72,8 @@
 
         try {
             event = await $eventRepo.updateEvent(event.id.toString(), ev);
+            successToast = true;
+            setTimeout(() => successToast = false, 5000);
         } catch (e) {
             error = e;
             errorOpen = true;
@@ -128,3 +133,8 @@
         <Button class="ml-4" color="red" on:click={del}>Delete</Button>
     </div>
 </Modal>
+
+<Toast bind:open={successToast} position="bottom-left" color="green">
+    <CheckCircleOutline slot="icon"/>
+    Updated Successfully
+</Toast>
diff --git a/src/pages/event/FightList.svelte b/src/pages/event/FightList.svelte
index 6dfdb57..ecf2172 100644
--- a/src/pages/event/FightList.svelte
+++ b/src/pages/event/FightList.svelte
@@ -135,7 +135,7 @@
 
     $: minTime = moment(Math.min(...fights.map(fight => fight.start))).utc(true);
     let changeTimeOpen = false;
-    let changedTime = moment(Math.min(...fights.map(fight => fight.start)))?.utc(true).toISOString().slice(0, -1);
+    let changedTime = moment(Math.min(...fights.map(fight => fight.start)))?.utc(true)?.toISOString()?.slice(0, -1);
 
     $: deltaTime = moment.duration(moment(changedTime).utc(true).diff(minTime))
 
diff --git a/src/pages/generate/GroupGenerator.svelte b/src/pages/generate/GroupGenerator.svelte
index fbb476c..2004736 100644
--- a/src/pages/generate/GroupGenerator.svelte
+++ b/src/pages/generate/GroupGenerator.svelte
@@ -112,7 +112,6 @@
     }
 
     $: groupsFights = generateGroups(groups)
-    $: console.log(groupsFights)
 
     $: generateDisabled = groupsFights.length > 0 && groupsFights.every(value => value.every(value1 => value1.length > 0)) && gamemode !== '' && map !== ''
 
diff --git a/src/stores/stores.ts b/src/stores/stores.ts
index 1d589a7..4d42809 100644
--- a/src/stores/stores.ts
+++ b/src/stores/stores.ts
@@ -19,15 +19,15 @@ export const gamemodes = cached<string[]>([], () => {
         .then(res => res.json())
 })
 
-export const maps = cachedFamily<string, string[]>([], (gamemode) => {
-    return fetch(`https://steamwar.de/eventplanner-api/data/gamemodes/${gamemode}/maps`, {headers: {"X-SW-Auth": get(tokenStore)}})
-        .then(res => {
-            if(!res.ok) {
-                return [];
-            } else {
-                return res.json();
-            }
-        })
+export const maps = cachedFamily<string, string[]>([], async (gamemode) => {
+    if (get(gamemodes).every(value => value !== gamemode)) return [];
+
+    const res = await fetch(`https://steamwar.de/eventplanner-api/data/gamemodes/${gamemode}/maps`, {headers: {"X-SW-Auth": get(tokenStore)}});
+    if (!res.ok) {
+        return [];
+    } else {
+        return res.json();
+    }
 })
 
 export const groups = cached<string[]>([], () => {