diff --git a/apps/dispatch/app/(app)/dispatch/page.tsx b/apps/dispatch/app/(app)/dispatch/page.tsx
index 648945fc..af5c8045 100644
--- a/apps/dispatch/app/(app)/dispatch/page.tsx
+++ b/apps/dispatch/app/(app)/dispatch/page.tsx
@@ -18,14 +18,10 @@ const DispatchPage = () => {
 		<div className="relative flex-1 flex transition-all duration-500 ease w-full">
 			{/* <MapToastCard2 /> */}
 			<div className="flex flex-1 relative">
-				<div className="absolute left-0 top-1/2 transform -translate-y-1/2 pl-4 z-999999">
+				<div className="absolute left-0 top-1/2 transform -translate-y-1/2 pl-4 z-999999 space-y-2">
 					<Chat />
-					<div className="mt-2">
-						<Report />
-					</div>
-					<div className="mt-2">
-						<BugReport />
-					</div>
+					<Report />
+					<BugReport />
 				</div>
 				<div className="absolute left-0 top-19/20 transform -translate-y-1/2 pl-4 z-999999">
 					<div className="flex items-center justify-between gap-4">
diff --git a/apps/dispatch/app/(app)/pilot/page.tsx b/apps/dispatch/app/(app)/pilot/page.tsx
index 015ec84e..ca3b6cdd 100644
--- a/apps/dispatch/app/(app)/pilot/page.tsx
+++ b/apps/dispatch/app/(app)/pilot/page.tsx
@@ -33,14 +33,10 @@ const PilotPage = () => {
 		<div className="relative flex-1 flex transition-all duration-500 ease w-full h-screen overflow-hidden">
 			{/* <MapToastCard2 /> */}
 			<div className="flex flex-1 relative w-full h-full">
-				<div className="absolute left-0 top-1/2 transform -translate-y-1/2 pl-4 z-999999">
+				<div className="absolute left-0 top-1/2 transform -translate-y-1/2 pl-4 z-999999 space-y-2">
 					<Chat />
-					<div className="mt-2">
-						<Report />
-					</div>
-					<div className="mt-2">
-						<BugReport />
-					</div>
+					<Report />
+					<BugReport />
 				</div>
 				<div className="flex w-2/3 h-full">
 					<div className="relative flex flex-1 h-full">
diff --git a/apps/dispatch/app/_components/left/Chat.tsx b/apps/dispatch/app/_components/left/Chat.tsx
index b62e4842..21b0b177 100644
--- a/apps/dispatch/app/_components/left/Chat.tsx
+++ b/apps/dispatch/app/_components/left/Chat.tsx
@@ -9,6 +9,7 @@ import { useQuery } from "@tanstack/react-query";
 import { getConnectedDispatcherAPI } from "_querys/dispatcher";
 import { getConnectedAircraftsAPI } from "_querys/aircrafts";
 import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
 
 export const Chat = () => {
 	const {
@@ -28,6 +29,7 @@ export const Chat = () => {
 	const [addTabValue, setAddTabValue] = useState<string>("default");
 	const [message, setMessage] = useState<string>("");
 	const dispatcherConnected = useDispatchConnectionStore((state) => state.status === "connected");
+	const pilotConnected = usePilotConnectionStore((state) => state.status === "connected");
 
 	const { data: dispatcher } = useQuery({
 		queryKey: ["dispatcher"],
@@ -51,6 +53,14 @@ export const Chat = () => {
 		(a) => a.userId !== session.data?.user.id && dispatcherConnected,
 	);
 
+	const btnActive = pilotConnected || dispatcherConnected;
+
+	useEffect(() => {
+		if (!btnActive) {
+			setChatOpen(false);
+		}
+	}, [btnActive, setChatOpen]);
+
 	return (
 		<div className={cn("dropdown dropdown-right dropdown-center", chatOpen && "dropdown-open")}>
 			<div className="indicator">
@@ -58,8 +68,12 @@ export const Chat = () => {
 					<span className="indicator-item status status-info animate-ping"></span>
 				)}
 				<button
-					className="btn btn-soft btn-sm btn-primary"
+					className={cn(
+						"btn btn-soft btn-sm cursor-default",
+						btnActive && "btn-primary cursor-pointer",
+					)}
 					onClick={() => {
+						if (!btnActive) return;
 						setReportTabOpen(false);
 						setChatOpen(!chatOpen);
 						if (selectedChat) {
diff --git a/apps/dispatch/app/_components/left/Report.tsx b/apps/dispatch/app/_components/left/Report.tsx
index 6706f110..cf9515c4 100644
--- a/apps/dispatch/app/_components/left/Report.tsx
+++ b/apps/dispatch/app/_components/left/Report.tsx
@@ -10,6 +10,8 @@ import { useQuery } from "@tanstack/react-query";
 import { getConnectedDispatcherAPI } from "_querys/dispatcher";
 import { sendReportAPI } from "_querys/report";
 import { getConnectedAircraftsAPI } from "_querys/aircrafts";
+import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
 
 export const Report = () => {
 	const { setChatOpen, setReportTabOpen, reportTabOpen, setOwnId } = useLeftMenuStore();
@@ -18,6 +20,9 @@ export const Report = () => {
 	const [selectedPlayer, setSelectedPlayer] = useState<string>("default");
 	const [message, setMessage] = useState<string>("");
 
+	const dispatcherConnected = useDispatchConnectionStore((state) => state.status === "connected");
+	const pilotConnected = usePilotConnectionStore((state) => state.status === "connected");
+
 	useEffect(() => {
 		if (!session.data?.user.id) return;
 		setOwnId(session.data.user.id);
@@ -36,6 +41,13 @@ export const Report = () => {
 
 	const filteredDispatcher = dispatcher?.filter((d) => d.userId !== session.data?.user.id);
 	const filteredAircrafts = aircrafts?.filter((a) => a.userId !== session.data?.user.id);
+	const btnActive = pilotConnected || dispatcherConnected;
+
+	useEffect(() => {
+		if (!btnActive) {
+			setReportTabOpen(false);
+		}
+	}, [btnActive, setReportTabOpen]);
 
 	return (
 		<div
@@ -43,8 +55,12 @@ export const Report = () => {
 		>
 			<div className="indicator">
 				<button
-					className="btn btn-soft btn-sm btn-error"
+					className={cn(
+						"btn btn-soft btn-sm cursor-default",
+						btnActive && "cursor-pointer btn-error",
+					)}
 					onClick={() => {
+						if (!btnActive) return;
 						setChatOpen(false);
 						setReportTabOpen(!reportTabOpen);
 					}}
diff --git a/apps/dispatch/app/_components/map/ContextMenu.tsx b/apps/dispatch/app/_components/map/ContextMenu.tsx
index 830a2c33..fa76c88f 100644
--- a/apps/dispatch/app/_components/map/ContextMenu.tsx
+++ b/apps/dispatch/app/_components/map/ContextMenu.tsx
@@ -53,7 +53,7 @@ export const ContextMenu = () => {
 
 	if (!contextMenu || !dispatcherConnected) return null;
 
-	const einsatzBtnText = missionFormValues && isOpen ? "Position übernehmen" : "Einsatz erstellen";
+	const missionBtnText = missionFormValues && isOpen ? "Position übernehmen" : "Einsatz erstellen";
 
 	const addOSMobjects = async (ignorePreviosSelected?: boolean) => {
 		const res = await fetch(
@@ -108,7 +108,7 @@ export const ContextMenu = () => {
 					{/* Top Button */}
 					<button
 						className="btn btn-circle bg-rescuetrack w-10 h-10 absolute left-1/2 top-0 pointer-events-auto opacity-80 tooltip tooltip-top tooltip-accent"
-						data-tip={einsatzBtnText}
+						data-tip={missionBtnText}
 						style={{ transform: "translateX(-50%)" }}
 						onClick={async () => {
 							const { parsed } = await getOsmAddress(contextMenu.lat, contextMenu.lng);
diff --git a/apps/dispatch/app/_components/map/Map.tsx b/apps/dispatch/app/_components/map/Map.tsx
index b108fff9..4e794e25 100644
--- a/apps/dispatch/app/_components/map/Map.tsx
+++ b/apps/dispatch/app/_components/map/Map.tsx
@@ -12,6 +12,7 @@ import { MarkerCluster } from "_components/map/_components/MarkerCluster";
 import { useEffect, useRef } from "react";
 import { Map as TMap } from "leaflet";
 import { DistanceLayer } from "_components/map/Measurement";
+import { MapAdditionals } from "_components/map/MapAdditionals";
 
 const Map = () => {
 	const ref = useRef<TMap | null>(null);
@@ -48,6 +49,7 @@ const Map = () => {
 			<MissionLayer />
 			<AircraftLayer />
 			<DistanceLayer />
+			<MapAdditionals />
 		</MapContainer>
 	);
 };
diff --git a/apps/dispatch/app/_components/map/MapAdditionals.tsx b/apps/dispatch/app/_components/map/MapAdditionals.tsx
new file mode 100644
index 00000000..fa15ea75
--- /dev/null
+++ b/apps/dispatch/app/_components/map/MapAdditionals.tsx
@@ -0,0 +1,20 @@
+"use client";
+import { usePannelStore } from "_store/pannelStore";
+import { Marker } from "react-leaflet";
+import L from "leaflet";
+
+export const MapAdditionals = () => {
+	const missionForm = usePannelStore((state) => state.missionFormValues);
+
+	if (!missionForm?.addressLat || !missionForm?.addressLng) return null;
+
+	return (
+		<>
+			<Marker
+				position={[missionForm.addressLat, missionForm.addressLng]}
+				icon={L.icon({ iconUrl: "/icons/mapMarker.png", iconSize: [40, 40], iconAnchor: [20, 35] })}
+				interactive={false}
+			/>
+		</>
+	);
+};
diff --git a/apps/dispatch/public/icons/mapMarker.png b/apps/dispatch/public/icons/mapMarker.png
new file mode 100644
index 00000000..c0fdd221
Binary files /dev/null and b/apps/dispatch/public/icons/mapMarker.png differ