diff --git a/Client/Gui/infobox.js b/Client/Gui/infobox.js
index 9be428fa..f8262bd2 100644
--- a/Client/Gui/infobox.js
+++ b/Client/Gui/infobox.js
@@ -9,6 +9,7 @@ var dateString;
 var timeString; 
 
 var draw = false;
+var editMode = false;
 
 let posX = 0.92;
 let posY = 0.45;
@@ -43,6 +44,10 @@ mp.events.add("draw", (pName, pId) => {
 
 });
 
+mp.events.add("toggleEditMode", (toggle) => {
+    editMode = toggle;
+});
+
 mp.events.add("toggleUi", (show) => {
     if (show === false) {
         draw = false;
@@ -189,4 +194,13 @@ mp.events.add("render", () => {
                 outline: true
             })  
     }
+    if (editMode === true) {
+        mp.game.graphics.drawText("~r~EDIT-MODE AKTIV", [0.5, 0],
+            {
+                font: 4,
+                color: [255, 255, 255, 255],
+                scale: [0.7, 0.7],
+                outline: true
+            }) 
+    }
 });
\ No newline at end of file
diff --git a/Main.cs b/Main.cs
index bca7051c..4f19f29f 100644
--- a/Main.cs
+++ b/Main.cs
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using reallife_gamemode.Model;
 using reallife_gamemode.Server.Entities;
 using reallife_gamemode.Server.Managers;
+using reallife_gamemode.Server.Saves;
 
 /**
 * @overview Life of German Reallife - Main Class (Main.cs)
@@ -54,15 +55,5 @@ namespace reallife_gamemode
 
             NAPI.Data.SetWorldData("blipTemplate", tempBlip);
         }
-    }
-
-    public class TempBlip
-    {
-        public byte Color { get; set; }
-        public string Name { get; set; }
-        public byte Transparency { get; set; }
-        public bool ShortRange { get; set; }
-        public uint Sprite { get; set; }
-        public float Scale { get; set; }
-    }
+    }  
 }
\ No newline at end of file
diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index b69bc5a7..0263a0ec 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -14,6 +14,7 @@ using reallife_gamemode.Server.Extensions;
 using reallife_gamemode.Server.Services;
 using reallife_gamemode.Server.Util;
 using reallife_gamemode.Server.Managers;
+using reallife_gamemode.Server.Saves;
 
 /**
 * @overview Life of German Reallife - Admin Commands (Admin.cs)
@@ -907,11 +908,13 @@ namespace reallife_gamemode.Server.Commands
             {
                 player.SetData("editmode", true);
                 player.SendNotification("Edit-Mode ~g~aktiviert");
+                player.TriggerEvent("toggleEditMode", true);
             }
             else
             {
                 player.SetData("editmode", false);
                 player.SendNotification("Edit-Mode ~r~deaktiviert");
+                player.TriggerEvent("toggleEditMode", false);
             }
 
         }
diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs
index 26cc7a24..5a87a04b 100644
--- a/Server/Events/Key.cs
+++ b/Server/Events/Key.cs
@@ -4,6 +4,7 @@ using System.Text;
 using GTANetworkAPI;
 using Newtonsoft.Json;
 using reallife_gamemode.Server.Extensions;
+using reallife_gamemode.Server.Saves;
 using reallife_gamemode.Server.Util;
 /**
 * @overview Life of German Reallife - Event Key (Key.cs)
@@ -23,6 +24,7 @@ namespace reallife_gamemode.Server.Events
                 TempBlip tempBlip = NAPI.Data.GetWorldData("blipTemplate");
                 SaveManager.OnSaveBlipData(player, tempBlip.Sprite.ToString(), tempBlip.Name, tempBlip.Scale.ToString(), tempBlip.Color.ToString(), 
                     tempBlip.Transparency.ToString(), 200.ToString(), tempBlip.ShortRange.ToString(), 0.ToString(), 0.ToString());
+                player.SendNotification("~y~Blip~s~ erstellt!", false);
             }           
         }
 
diff --git a/Server/Saves/SavedBlip.cs b/Server/Saves/SavedBlip.cs
index f7b14343..8080ca21 100644
--- a/Server/Saves/SavedBlip.cs
+++ b/Server/Saves/SavedBlip.cs
@@ -35,4 +35,14 @@ namespace reallife_gamemode.Server.Saves
         public byte Dimension { get; set; }
         public bool Active { get; set; }
     }
+
+    public class TempBlip
+    {
+        public byte Color { get; set; }
+        public string Name { get; set; }
+        public byte Transparency { get; set; }
+        public bool ShortRange { get; set; }
+        public uint Sprite { get; set; }
+        public float Scale { get; set; }
+    }
 }