diff --git a/apps/dispatch/app/(app)/pilot/page.tsx b/apps/dispatch/app/(app)/pilot/page.tsx
index af023c97..f68a358b 100644
--- a/apps/dispatch/app/(app)/pilot/page.tsx
+++ b/apps/dispatch/app/(app)/pilot/page.tsx
@@ -33,20 +33,20 @@ const PilotPage = () => {
 		<div className="ease relative flex h-screen w-full flex-1 overflow-hidden transition-all duration-500">
 			{/* <MapToastCard2 /> */}
 			<div className="relative flex h-full w-full flex-1">
-				<div className="z-999999 absolute left-0 top-1/2 flex -translate-y-1/2 transform flex-col space-y-2 pl-4">
+				<div className="absolute left-0 top-1/2 z-20 flex -translate-y-1/2 transform flex-col space-y-2 pl-4">
 					<Chat />
 					<Report />
 					<BugReport />
 				</div>
 				<div className="flex h-full w-2/3">
 					<div className="relative flex h-full flex-1">
-						<div className="top-19/20 z-999999 absolute left-0 -translate-y-1/2 transform pl-4">
+						<div className="top-19/20 absolute left-0 z-20 -translate-y-1/2 transform pl-4">
 							<div className="flex items-center justify-between gap-4">
 								<SettingsBoard />
 							</div>
 						</div>
 						<Map />
-						<div className="z-99999 absolute right-10 top-5 space-y-2">
+						<div className="absolute right-10 top-5 z-20 space-y-2">
 							{!simulatorConnected && status === "connected" && (
 								<SimConnectionAlert lastUpdated={ownAircraft?.lastHeartbeat} />
 							)}
diff --git a/apps/dispatch/app/_components/map/Map.tsx b/apps/dispatch/app/_components/map/Map.tsx
index 4e794e25..b2ba520f 100644
--- a/apps/dispatch/app/_components/map/Map.tsx
+++ b/apps/dispatch/app/_components/map/Map.tsx
@@ -37,7 +37,7 @@ const Map = () => {
 	return (
 		<MapContainer
 			ref={ref}
-			className="flex-1 bg-base-200"
+			className="bg-base-200 z-10 flex-1"
 			center={map.center}
 			zoom={map.zoom}
 			fadeAnimation={false}
diff --git a/apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx b/apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx
index d294faf2..423c6f2d 100644
--- a/apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx
+++ b/apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx
@@ -23,14 +23,14 @@ export const ConnectedDispatcher = () => {
 
 	return (
 		<div className="min-w-120">
-			<div className="collapse collapse-arrow bg-base-100 border-base-300 border">
+			<div className="collapse-arrow bg-base-100 border-base-300 collapse border">
 				<input type="checkbox" />
 				{/* <div className="collapse-title font-semibold">Kein Disponent Online</div> */}
-				<div className="collapse-title font-semibold flex items-center justify-between">
+				<div className="collapse-title flex items-center justify-between font-semibold">
 					<span>
 						{connections} {connections == 1 ? "Verbundenes Mitglied" : "Verbundene Mitglieder"}
 					</span>
-					<div className="gap-2 flex items-center">
+					<div className="flex items-center gap-2">
 						<div
 							className={`badge badge-outline ${
 								(dispatcher?.length || 0) > 0 ? "badge-success" : "badge-error"
@@ -65,7 +65,7 @@ export const ConnectedDispatcher = () => {
 												className="tooltip tooltip-right"
 												data-tip={`vorraussichtliche Abmeldung in ${formatDistance(new Date(), new Date(d.esimatedLogoutTime), { locale: de })}`}
 											>
-												<p className="text-gray-500 font-thin ">
+												<p className="font-thin text-gray-500">
 													{new Date(d.esimatedLogoutTime).toLocaleTimeString([], {
 														hour: "2-digit",
 														minute: "2-digit",
@@ -76,7 +76,7 @@ export const ConnectedDispatcher = () => {
 									</div>
 									<div>
 										<div>{asPublicUser(d.publicUser).fullName}</div>
-										<div className="text-xs uppercase font-semibold opacity-60">{d.zone}</div>
+										<div className="text-xs font-semibold uppercase opacity-60">{d.zone}</div>
 									</div>
 									<div>
 										{(() => {