diff --git a/client/TravellingMerchant.lua b/client/TravellingMerchant.lua
index b5b8952..4b45027 100644
--- a/client/TravellingMerchant.lua
+++ b/client/TravellingMerchant.lua
@@ -7,6 +7,7 @@ local function spawn()
     Freeze(ped, true, data.loc.w)
     Bridge.Target.AddLocalEntity(ped, {
         {
+            icon = Bridge.Language.Locale('merchant.targetIcon'),
             label = Bridge.Language.Locale('merchant.targetOpen'),
             action = function()
                 local options = {}
diff --git a/client/functions.lua b/client/functions.lua
index aabb170..d40d515 100644
--- a/client/functions.lua
+++ b/client/functions.lua
@@ -104,8 +104,8 @@ function PoliceCall(chance)
 	local math = math.random(1,100)
 	if math <= chance then
 		Bridge.Dispatch.SendAlert({
-		    message = "Suspisous Handoff",
-		    code = "10-31",
+		    message = Bridge.Language.Locale('Dispatch.header'),
+		    code = Bridge.Language.Locale('Dispatch.code'),
 		    coords = GetEntityCoords(PlayerPedId()),
 		    jobs = {"police"},
 		    blipData = {
@@ -114,7 +114,7 @@ function PoliceCall(chance)
 		        scale = 1.0
 		    },
 		    time = 300000,
-		    icon = "fas fa-exclamation-triangle"
+		    icon = Bridge.Language.Locale('Dispatch.icon')
 		})
 	else
 		return
@@ -124,7 +124,7 @@ end
 function GetCops(number)
 	if number == 0 then return true end
 	local amount = Bridge.Callback.Trigger('md-drugs:server:GetCoppers')
-	if amount >= number then return true else Bridge.Notify.SendNotify('You Need '.. number - amount .. ' More Cops To Do This', 'error')  end
+	if amount >= number then return true else Bridge.Notify.SendNotify(string.format(Bridge.Language.Locale('Catches.YouNeedMoreCops'), number - amount), 'error')  end
 end
 
 function Freeze(entity, toggle, head)
@@ -272,14 +272,14 @@ RegisterCommand('DrugRep', function()
 	local rep = GetRep()
 	Bridge.Menu.Open({
 		id = 'drugrep',
-		title = 'Drug Reputation',
-		description = 'Your Current Drug Reputation Stats',
+		title = Bridge.Language.Locale('DrugRep.header'),
+		description = Bridge.Language.Locale('DrugRep.increased'),
 		options = {
-			{icon = "fa-solid fa-face-flushed", title = 'Cocaine: '..rep.coke},
-			{icon = "fa-solid fa-syringe", 	  title = 'Heroin: '..rep.heroin},
-			{icon = "fa-solid fa-vial",		  title = 'LSD: '..rep.lsd},
-			{icon = "fa-solid fa-plug", 		  title = 'Dealer: '..rep.dealerrep},
-			{icon = "fa-solid fa-money-bill",   title = 'Corner Selling: ' .. rep.cornerselling.rep, description = 'Rank: ' .. rep.cornerselling.label }
+			{icon = Bridge.Language.Locale('DrugRep.coke.icon'), title = Bridge.Language.Locale('DrugRep.coke.title', rep.coke)},
+			{icon = Bridge.Language.Locale('DrugRep.heroin.icon'), 	  title = Bridge.Language.Locale('DrugRep.heroin.title', rep.heroin)},
+			{icon = Bridge.Language.Locale('DrugRep.lsd.icon'),		  title = Bridge.Language.Locale('DrugRep.lsd.title', rep.lsd)},
+			{icon = Bridge.Language.Locale('DrugRep.dealerrep.icon'), 		  title = Bridge.Language.Locale('DrugRep.dealerrep.title', rep.dealerrep)},
+			{icon = Bridge.Language.Locale('DrugRep.cornerselling.icon'),   title = Bridge.Language.Locale('DrugRep.cornerselling.title', rep.cornerselling.rep), description = Bridge.Language.Locale('DrugRep.cornerselling.description', rep.cornerselling.label) }
 		}
 	})
 end, false)
diff --git a/client/lean.lua b/client/lean.lua
index 02141bd..0f6b869 100644
--- a/client/lean.lua
+++ b/client/lean.lua
@@ -74,7 +74,7 @@ for k, v in pairs (location.SyrupVendor) do
 	Freeze(leanPeds[k], true, v.loc.w)
 	Bridge.Target.AddLocalEntity(leanPeds[k], {
 		{
-			icon = Bridge.Language.Locale('lean.startMission'),
+			icon = Bridge.Language.Locale('lean.startMissionIcon'),
 			label = Bridge.Language.Locale('lean.startMission'),
 			action = function()
 				SpawnCarPedChase()
diff --git a/client/lsd.lua b/client/lsd.lua
index 622b191..996aeb3 100644
--- a/client/lsd.lua
+++ b/client/lsd.lua
@@ -12,7 +12,7 @@ local function createLabKit(coord, head)
     tableout = true
     local options = {
         {
-            icon = "fa-solid fa-temperature-high",
+            icon = Bridge.Language.Locale('lsd.targetHeatIcon'),
             label = Bridge.Language.Locale('lsd.targetHeat'),
             action = function()
 	            if not minigame() then
@@ -30,7 +30,7 @@ local function createLabKit(coord, head)
             end
         },
         {
-            icon = "fa-solid fa-temperature-high",
+            icon = Bridge.Language.Locale('lsd.targetRefineIcon'),
             label = Bridge.Language.Locale('lsd.targetRefine'),
             action = function()
                 if not itemCheck('lsd_one_vial') then return end
@@ -43,7 +43,7 @@ local function createLabKit(coord, head)
             end
         },
         {
-            icon = "fa-regular fa-note-sticky",
+            icon = Bridge.Language.Locale('lsd.targetDippingIcon'),
             label = Bridge.Language.Locale('lsd.targetDipping'),
             action = function()
                 if not itemCheck('tab_paper') then return end
@@ -56,7 +56,7 @@ local function createLabKit(coord, head)
             end
         },
         {
-            icon = "fas fa-box-circle-check",
+            icon = Bridge.Language.Locale('lsd.targetPickupIcon'),
             label = Bridge.Language.Locale('lsd.targetPickup'),
             action = function()
                 if not progressbar(Bridge.Language.Locale('lsd.packup')) then return end
@@ -69,7 +69,7 @@ local function createLabKit(coord, head)
             end
         },
         {
-            icon = "fa-solid fa-hand-sparkles",
+            icon = Bridge.Language.Locale('lsd.targetCleanIcon'),
             label = Bridge.Language.Locale('lsd.targetClean'),
             action = function()
                 if not itemCheck('cleaningkit') then return end
@@ -89,7 +89,7 @@ for k, v in pairs (locations.lysergicacid) do
     Bridge.Target.AddBoxZone('lysergicacid'..k,v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
         {
             label = Bridge.Language.Locale('lsd.targetLys'),
-            icon = 'fa-solid fa-temperature-high',
+            icon = Bridge.Language.Locale('lsd.targetLysIcon'),
             action = function()
                 if not minigame() then TriggerServerEvent("md-drugs:server:faillysergic") return end
                 if not progressbar(Bridge.Language.Locale('lsd.stealLys')) then return end
@@ -107,7 +107,7 @@ for k, v in pairs (locations.diethylamide) do
     Bridge.Target.AddBoxZone('diethylamide'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
         {
             label = Bridge.Language.Locale('lsd.targetDie'),
-            icon = 'fa-solid fa-temperature-high',
+            icon = Bridge.Language.Locale('lsd.targetDieIcon'),
             action = function()
                 if not minigame() then TriggerServerEvent("md-drugs:server:faildiethylamide") return end
                 if not progressbar(Bridge.Language.Locale('lsd.stealDie')) then return end
@@ -125,7 +125,7 @@ for k, v in pairs (locations.gettabs) do
     Bridge.Target.AddBoxZone('gettabs'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
         {
             label = Bridge.Language.Locale('lsd.targetBuyTab'),
-            icon = 'fa-solid fa-hand-holding-dollar',
+            icon = Bridge.Language.Locale('lsd.targetBuyTabIcon'),
             action = function()
                 TriggerServerEvent("md-drugs:server:gettabpaper", k)
             end,
@@ -145,7 +145,7 @@ for k, v in pairs (locations.buyLSDkit) do
     Bridge.Target.AddLocalEntity(seller[k], {
         {
             label = Bridge.Language.Locale('lsd.targetBuyKit'),
-            icon = 'fa-solid fa-hand-holding-dollar',
+            icon = Bridge.Language.Locale('lsd.targetBuyKitIcon'),
             action = function()
                 if Bridge.Inventory.HasItem('lsdlabkit') then
                     Bridge.Notify.SendNotify(Bridge.Language.Locale('lsd.alreadyOwn'), 'error')
diff --git a/client/mescaline.lua b/client/mescaline.lua
index 4649584..b3f8d1c 100644
--- a/client/mescaline.lua
+++ b/client/mescaline.lua
@@ -21,7 +21,7 @@ for k, v in pairs (locations.DryOutMescaline) do
 			icon = 'fa-solid fa-temperature-high',
 			action = function()
 				if not itemCheck('cactusbulb') then return end
-				if not progressbar(Bridge.Language.Locale('mescaline.dry')) then return end
+				if not progressbar(Bridge.Language.Locale('mesc.dry')) then return end
 				TriggerServerEvent("md-drugs:server:drymescaline", k)
 			end,
 			canInteract = function()
@@ -36,7 +36,7 @@ RegisterNetEvent("md-drugs:client:takemescaline", function()
     local chance, chance2 = math.random(1,100), math.random(1,100)
     local weapon = ''
     if chance2 == 100 then weapon = 'weapon_rpg' else weapon = 'weapon_flaregun' end
-    if not progressbar(Bridge.Language.Locale('mescaline.eat')) then return end
+    if not progressbar(Bridge.Language.Locale('mesc.eat')) then return end
 	if chance <= badTrip then
 		AlienEffect()
 		Wait(math.random(3000,6000))
diff --git a/client/meth.lua b/client/meth.lua
index 4fa58c9..8102dcd 100644
--- a/client/meth.lua
+++ b/client/meth.lua
@@ -41,7 +41,7 @@ local function SpawnMethCarPedChase(loc)
 			Bridge.Target.AddLocalEntity(methVan, {
 				{
 					name = 'methcar',
-					icon = 'fa-solid fa-car',
+					icon = Bridge.Language.Locale('meth.targetStealFromCarIcon'),
 					label = Bridge.Language.Locale('meth.targetStealFromCar'),
 					action = function()
 						if not minigame() then return end
@@ -66,10 +66,13 @@ for k, v in pairs (locations.MethHeist) do
 	Freeze(peds[k], true, v.loc.w)
 	Bridge.Target.AddLocalEntity(peds[k], {
 		{
-			icon = 'fa-solid fa-user-secret',
+			icon = Bridge.Language.Locale('meth.targetHeistIcon'),
 			label = Bridge.Language.Locale('meth.targetHeist'),
 			action = function()
-				if startedmeth then Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.alreadyChasing'),'error') return end
+				if startedmeth then 
+					Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.alreadyChasing'),'error')
+					return 
+				end
 				SpawnMethCarPedChase(k)
 			end,
 			canInteract = function()
@@ -268,7 +271,7 @@ local function smash(coords, offset, rotation, buckets, k)
 		Bridge.Target.AddLocalEntity(bucket, {
 			{
 				name = 'bucket',
-				icon = "fa-solid fa-sack-xmark",
+				icon = Bridge.Language.Locale('meth.targetBagIcon'),
 				label = Bridge.Language.Locale('meth.targetBag'),
 				action = function()
 					DeleteObject(bucket)
@@ -312,7 +315,7 @@ for k, v in pairs (locations.CookMeth) do
 	Bridge.Target.AddBoxZone('cookMeth'..k, v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
 		{
 			label = Bridge.Language.Locale('meth.targetCook'),
-			icon = 'fa-solid fa-temperature-high',
+			icon = Bridge.Language.Locale('meth.targetCookIcon'),
 			action = function()
 				startcook(k, v.loc, v.offset or vec3(0,0,0), v.rotation or vector3(0,0,180.0))
 			end,
@@ -324,7 +327,7 @@ for k, v in pairs (locations.CookMeth) do
 			end,
 		},
 		{
-			icon = "fas fa-sign-in-alt",
+			icon = Bridge.Language.Locale('meth.targetGrabTrayIcon'),
 			label = Bridge.Language.Locale('meth.targetGrabTray'),
 			action = function() trayscarry() end,
 		  	canInteract = function()
@@ -341,15 +344,15 @@ for k, v in pairs (locations.MethDials) do
 	Bridge.Target.AddBoxZone('adjustMethDials'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, {
 		{
 			name = 'adjustdials',
-			icon = "fa-solid fa-temperature-three-quarters",
+			icon = Bridge.Language.Locale('meth.targetHeatIcon'),
 			label = Bridge.Language.Locale('meth.targetHeat'),
 			action = function()
 				dials(locations.CookMeth[k].loc)
 			end,
-			--canInteract = function()
-			--	if not handleGang(v.gang) then return false end
-			--	if amonia and heated == false then return true end
-			--end
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				if amonia and heated == false then return true end
+			end
 		}
 	})
 end
@@ -358,7 +361,7 @@ for k, v in pairs (locations.MethSmash) do
 	Bridge.Target.AddBoxZone('smashMeth'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, {
 		{
 			name = 'smash',
-			icon = "fa-solid fa-weight-scale",
+			icon = Bridge.Language.Locale('meth.targetSmashIcon'),
 			label = Bridge.Language.Locale('meth.targetSmash'),
 			action = function()
 				smash(v.loc, v.offset, v.rotation, v.bucket,k)
@@ -374,8 +377,8 @@ end
 for k, v in pairs (locations.MethTele) do
 	Bridge.Target.AddBoxZone('meth_tele'..k, v.inside, vector3(v.l, v.w, 1.0), v.rot, {
 		{
-			icon = 'fa-solid fa-door-open',
-			label = Bridge.Language.Locale('coke.teleOut'),
+			icon = Bridge.Language.Locale('meth.teleOutIcon'),
+			label = Bridge.Language.Locale('meth.teleOut'),
 			action = function()
 				SetEntityCoords(PlayerPedId(), v.outside)
 			end,
@@ -386,8 +389,8 @@ for k, v in pairs (locations.MethTele) do
 	})
 	Bridge.Target.AddBoxZone('meth_teleout'..k, v.outside, vector3(v.l, v.w, 1.0), v.rot, {
 		{
-			icon = 'fa-solid fa-door-closed',
-			label = Bridge.Language.Locale('coke.teleIn'),
+			icon = Bridge.Language.Locale('meth.teleInIcon'),
+			label = Bridge.Language.Locale('meth.teleIn'),
 			action = function()
 				SetEntityCoords(PlayerPedId(), v.inside)
 			end,
@@ -409,7 +412,7 @@ for k, v in pairs (locations.MethEph) do
 	Bridge.Target.AddBoxZone('stealMethEph'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, {
 		{
 			label = Bridge.Language.Locale('meth.targetStealEPH'),
-			icon = 'fa-solid fa-bucket',
+			icon = Bridge.Language.Locale('meth.targetStealEPHIcon'),
 			action = function()
 				if not progressbar(Bridge.Language.Locale('meth.stealingEPH')) then return end
 				TriggerServerEvent("md-drugs:server:geteph", k)
@@ -424,7 +427,7 @@ for k, v in pairs (locations.MethAce) do
 	Bridge.Target.AddBoxZone('stealMethAce'..k, v.loc, vector3(v.l, v.w, 1.0), v.loc.w or 180.0, {
 		{
 			label = Bridge.Language.Locale('meth.targetStealACE'),
-			icon = 'fa-solid fa-bucket',
+			icon = Bridge.Language.Locale('meth.targetStealACEIcon'),
 			action = function()
 				if not progressbar(Bridge.Language.Locale('meth.stealingACE')) then return end
 				TriggerServerEvent("md-drugs:server:getace", k)
diff --git a/client/oxyruns.lua b/client/oxyruns.lua
index 07a298c..f1efd99 100644
--- a/client/oxyruns.lua
+++ b/client/oxyruns.lua
@@ -27,7 +27,7 @@ local function getRoute()
 	Bridge.Target.AddLocalEntity(oxybuyer,{
 		{ 
 			label = Bridge.Language.Locale('oxy.targetHandoff'),
-			icon = "fa-solid fa-dollar-sign",
+			icon = Bridge.Language.Locale('oxy.targetHandOffIcon'),
 			action = function()
 				if carryPackage then
 					if not progressbar(Bridge.Language.Locale('oxy.handingoff')) then return end
@@ -48,7 +48,7 @@ end
 for k, v in pairs(locations.OxyPayForTruck) do
 	Bridge.Target.AddBoxZone('oxyTruckPur' ..k ,  v.loc, vector3(v.l, v.w, 2.0), v.loc.w or 180.0, {
 		{
-			icon = 'fa-solid fa-truck-fast',
+			icon = Bridge.Language.Locale('oxy.targetPayIcon'),
 			label = Bridge.Language.Locale('oxy.targetPay'),
 			action = function()
 				requestModel("burrito3", 30000)
@@ -65,7 +65,7 @@ for k, v in pairs(locations.OxyPayForTruck) do
 				
 				Bridge.Target.AddLocalEntity(vehicle,  {
 					{
-						icon = "fa-solid fa-box",
+						icon = Bridge.Language.Locale('oxy.targetGetPackageIcon'),
 						label = Bridge.Language.Locale('oxy.targetGetPackage'),
 						action = function()
 							if carryPackage then
diff --git a/client/pharma.lua b/client/pharma.lua
index 072fdbc..b5fde00 100644
--- a/client/pharma.lua
+++ b/client/pharma.lua
@@ -24,7 +24,7 @@ end)
 for k, v in pairs (locations.FillPrescription) do
     Bridge.Target.AddBoxZone('pharma' ..k , v.loc,vector3(v.l, v.w, 1.0), v.loc.w or 180, {
         {
-            icon = 'fa-solid fa-capsules',
+            icon = Bridge.Language.Locale('pharma.fillIcon'),
             label = Bridge.Language.Locale('pharma.targetFill'),
             action = function()
                 if not progressbar(Bridge.Language.Locale('pharma.fill')) then return end
diff --git a/client/plantSpawns.lua b/client/plantSpawns.lua
index 1fb57b1..8bd7bdd 100644
--- a/client/plantSpawns.lua
+++ b/client/plantSpawns.lua
@@ -7,6 +7,7 @@ local DrugPlants = {
             return true
         end,
         allow = Config.Drugs.cocaine,
+        icon = Bridge.Language.Locale('coke.pickIcon'),
     },
     {model = 'prop_plant_01b', label = 'heroin',langs = Bridge.Language.Locale('heroin.targetPick'), tbl = GlobalState.PoppyPlants, plantTbl = {},
         pick = function(loc)
@@ -15,6 +16,7 @@ local DrugPlants = {
             return true
         end,
         allow = Config.Drugs.heroin,
+        icon = Bridge.Language.Locale('heroin.pickIcon'),
     },
     {model = 'prop_cactus_03', label = 'Mescaline', langs = Bridge.Language.Locale('mesc.targetPick'), tbl = GlobalState.Mescaline, plantTbl = {},
         pick = function(loc)
@@ -23,6 +25,7 @@ local DrugPlants = {
             return true
         end,
         allow = Config.Drugs.mescaline,
+        icon = Bridge.Language.Locale('mesc.pickIcon'),
 
     },
     {model = 'prop_weed_01', label = 'weed', langs = Bridge.Language.Locale('weed.targetPick'), tbl = GlobalState.WeedPlant, plantTbl = {},
@@ -32,6 +35,7 @@ local DrugPlants = {
             return true
         end,
         allow = Config.Drugs.weed,
+        icon = Bridge.Language.Locale('weed.pickIcon'),
     },
     {model = 'mushroom', label = 'shrooms', langs = Bridge.Language.Locale('shrooms.targetPick'), tbl = GlobalState.shrooms, plantTbl = {},
         pick = function(loc)
@@ -40,6 +44,7 @@ local DrugPlants = {
             return true
         end,
         allow = Config.Drugs.shrooms,
+        icon = Bridge.Language.Locale('shrooms.pickIcon'),
     },
 }
 
diff --git a/client/weed.lua b/client/weed.lua
index ccfdebd..dad3850 100644
--- a/client/weed.lua
+++ b/client/weed.lua
@@ -3,7 +3,7 @@ local locations, recipes = GlobalState.MDDrugsLocations.Weed, GlobalState.MDDrug
 for k, v in pairs (locations.WeedDry) do
 	Bridge.Target.AddBoxZone('weed_dry'..k, v.loc, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.loc.w or 180.0, {
 		{
-			icon = 'fa-solid fa-cannabis',
+			icon = Bridge.Language.Locale('weed.targetDryIcon'),
 			label = Bridge.Language.Locale('weed.targetDry'),
 			action = function()
 				if not itemCheck("wetcannabis") then return end
@@ -17,7 +17,7 @@ for k, v in pairs (locations.WeedDry) do
 				Bridge.Notify.SendNotify(Bridge.Language.Locale('weed.take'), "success")
 				Bridge.Target.AddLocalEntity(weedplant, {
 					{
-						icon = "fa-solid fa-cannabis",
+						icon = Bridge.Language.Locale('weed.targetDryIcon'),
 						label = Bridge.Language.Locale('weed.targetDryed'),
 						action = function()
 							DeleteEntity(weedplant)
@@ -38,7 +38,7 @@ end
 for k, v in pairs (locations.WeedTele) do
 	Bridge.Target.AddBoxZone('weed_tele'..k, v.inside, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.rot or 180.0, {
 		{
-			icon = 'fa-solid fa-door-open',
+			icon = Bridge.Language.Locale('weed.teleportOutIcon'),
 			label = Bridge.Language.Locale('weed.teleportOut'),
 			action = function()
 				SetEntityCoords(PlayerPedId(), v.outside)
@@ -47,7 +47,7 @@ for k, v in pairs (locations.WeedTele) do
 	})
 	Bridge.Target.AddBoxZone('weed_teleout'..k, v.outside, vector3(v.l or 1.0, v.w or 1.0, 1.0), v.rot or 180.0, {
 		{
-			icon = 'fa-solid fa-door-closed',
+			icon = Bridge.Language.Locale('weed.teleportInIcon'),
 			label = Bridge.Language.Locale('weed.teleportIn'),
 			action = function()
 				SetEntityCoords(PlayerPedId(), v.inside)
@@ -126,7 +126,7 @@ for k, v in pairs (locations.WeedSalesman) do
 	SetBlockingOfNonTemporaryEvents(ped, true)
 	Bridge.Target.AddLocalEntity(ped, {
 		{
-			icon = "fa-solid fa-cannabis",
+			icon = Bridge.Language.Locale('weed.salesIcon'),
 			label = Bridge.Language.Locale('weed.targetSales'),
 			action = function()
 				local options = {}
@@ -137,8 +137,8 @@ for k, v in pairs (locations.WeedSalesman) do
 						title = itemInfo.label,
 						description = '$' .. d,
 						onSelect = function()
-							local input = Bridge.Input.Open('Amount To Buy',{
-								{type = 'number', title = 'How Many To Buy', min = 1, max = 1000}
+							local input = Bridge.Input.Open(Bridge.Language.Locale('weed.salesHeader'),{
+								{type = 'number', title = Bridge.Language.Locale('weed.salesDesc'), min = 1, max = 1000}
 							})
 							if not input and input[1] then return end
 							if not progressbar(Bridge.Language.Locale('weed.buying', Bridge.Inventory.GetItemInfo(m).label)) then return end
@@ -148,7 +148,7 @@ for k, v in pairs (locations.WeedSalesman) do
 				end
 				Bridge.Menu.Open({
 					id = 'weedDude',
-					title = 'Weed Salesman',
+					title = Bridge.Language.Locale('weed.salessHeader'),
 					options = options,
 				})
 			end
@@ -166,7 +166,7 @@ for locationKey, locationData in pairs (locations.MakeButter) do
 		SetEntityHeading(props[#props], locationData.loc.w)
 		Bridge.Target.AddLocalEntity(props[#props], {
 			{
-				icon = "fa-solid fa-cannabis",
+				icon = Bridge.Language.Locale('weed.cannabisIcon'),
 				label = Bridge.Language.Locale('weed.targetMakeButter'),
 				action = function()
 					local options = {}
@@ -202,7 +202,7 @@ for locationKey, locationData in pairs (locations.MakeOil) do
 		SetEntityHeading(props[#props], locationData.loc.w)
 		Bridge.Target.AddLocalEntity(props[#props], {
 			{
-				icon = "fa-solid fa-cannabis",
+				icon = Bridge.Language.Locale('weed.cannabisIcon'),
 				label = Bridge.Language.Locale('weed.targetMakeOil'),
 				action = function()
 					local options = {}
diff --git a/client/whippit.lua b/client/whippit.lua
index 36545bc..7ad7335 100644
--- a/client/whippit.lua
+++ b/client/whippit.lua
@@ -48,7 +48,7 @@ local function spawnShops()
         Bridge.Target.AddLocalEntity(ped, {
            {
                label = Bridge.Language.Locale('Whippit.targetShop'),
-               icon = 'fa-solid fa-cart-shopping',
+               icon = Bridge.Language.Locale('Whippit.whippitIcon'),
                action = function()
                    local menu = {}
                    for item, price in pairs (GlobalState.MDDrugsRecipes.Whippit.shop) do
diff --git a/client/xtc.lua b/client/xtc.lua
index 22f1c67..7fff8dd 100644
--- a/client/xtc.lua
+++ b/client/xtc.lua
@@ -26,7 +26,7 @@ Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData)
     Freeze(press, true, head)
       local options = {
           {
-            icon = "fas fa-eye",
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
             label = Bridge.Language.Locale('xtc.targetMake'),
             distance = 2.0,
             action = function()
@@ -39,7 +39,7 @@ Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData)
                         title = Bridge.Language.Locale(k),
                         description = descript,
                         onSelect = function()
-                            if not minigame() then Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.fail'), "error") return end
+                            if not minigame() then return end
                             if not progressbar(Bridge.Language.Locale('xtc.making', Bridge.Language.Locale(k))) then return end
                             TriggerServerEvent("md-drugs:server:makextc", k)
                         end,
@@ -57,7 +57,7 @@ Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData)
             end
           },
           {
-            icon = "fas fa-eye",
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
             label = Bridge.Language.Locale('xtc.targetPickup'),
             action = function()
                if not progressbar(Bridge.Language.Locale('xtc.picking')) then return end
@@ -77,10 +77,10 @@ end)
 for k, v in pairs(locations.mdp2p) do
     Bridge.Target.AddBoxZone('mdp2p'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, {
         {
-            icon = 'fa-solid fa-flask',
+            icon = Bridge.Language.Locale('xtc.mdp2pIcon'),
             label = Bridge.Language.Locale('xtc.targetStealMDP2P'),
             action = function()
-                if not minigame() then Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.fail'), "error") return end
+                if not minigame() then  return end
                 if not progressbar(Bridge.Language.Locale('xtc.stealingMDP2P')) then return end
                 TriggerServerEvent("md-drugs:server:stealmdp2p", k)
             end,
@@ -93,10 +93,10 @@ end
 for k, v in pairs(locations.isosafrole) do
     Bridge.Target.AddBoxZone('isosafrole'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, {
         {
-            icon = 'fa-solid fa-flask',
+            icon = Bridge.Language.Locale('xtc.isosafroleIcon'),
             label = Bridge.Language.Locale('xtc.targetStealIsosafrole'),
             action = function()
-                if not minigame() then Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.fail'), "error") return end
+                if not minigame() then  return end
                 if not progressbar(Bridge.Language.Locale('xtc.stealingIsosafrole')) then return end
                 TriggerServerEvent("md-drugs:server:stealisosafrole", k)
             end,
@@ -110,10 +110,10 @@ end
 for k, v in pairs(locations.rawxtcloc) do
     Bridge.Target.AddBoxZone('xtcraw'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, {
         {
-            icon = 'fa-solid fa-flask',
+            icon = Bridge.Language.Locale('xtc.rawIcon'),
             label = Bridge.Language.Locale('xtc.targetRaw'),
             action = function()
-                if not minigame() then Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.fail'), "error") return end
+                if not minigame() then  return end
                 if not progressbar(Bridge.Language.Locale('xtc.makingRaw')) then return end
                 TriggerServerEvent("md-drugs:server:makingrawxtc", k)
             end,
@@ -130,7 +130,7 @@ for k, v in pairs(locations.xtcpress) do
     Freeze(ped, true, v.loc.w)
     Bridge.Target.AddLocalEntity(ped, {
         {
-            icon = 'fa-solid fa-flask',
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
             label = Bridge.Language.Locale('xtc.getPress'),
             onSelect = function()
                 local options = {}
@@ -179,7 +179,7 @@ end
 for k, v in pairs (locations.stamp) do
     Bridge.Target.AddBoxZone('xtcstamp'..k, v.loc, vector3(v.l, v.w, 2.0), v.rot or 180.0, {
         {
-            icon = 'fa-solid fa-flask',
+            icon = Bridge.Language.Locale('xtc.stampIcon'),
             label = Bridge.Language.Locale('xtc.targetStamp'),
             onSelect = function()
                 local item = {
@@ -195,7 +195,7 @@ for k, v in pairs (locations.stamp) do
                         title = d.label,
                         description = Bridge.Language.Locale('xtc.stamp_desc', d.color),
                         action = function()
-                            if not minigame() then Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.fail'), "error") return end
+                            if not minigame() then  return end
                             if not progressbar(Bridge.Language.Locale('xtc.stamping', d.label)) then return end
                             TriggerServerEvent("md-drugs:server:stamp", k, d.color)
                         end,
diff --git a/locales/en.json b/locales/en.json
index 0482e1b..d736ba5 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,16 +1,11 @@
 {
   "Catches": {
-    "outOfRangeWarn": "Player: %s attempted to exploit Event: '%s' by triggering the event out of range.",
-    "needItems": "You Do Not Have The Required Items",
-    "notEnoughMoney": "Youre To Broke",
-    "buySuccess": "You Bought %s %s For $%s",
+    "outOfRangeWarn": "Player: %s attempted to exploit Event: '%s' by triggering the event out of range.", 
+    "notEnoughMoney": "Damn You Are A Broke Fuck",
     "itemMissings": "You Need %s",
-    "itemNeeded": "You Need %s",
-    "cooldown": "Slow Down Speed Racer",
-    "invalidItem": "This Item Is Not Sold Here",
     "onCooldownWarn": "Player: %s Attempted To Run Event %s \n  while on cooldown",
-    "noCops": "Not Enough Police Online",
-    "missedTable": "Player: %s attempted to exploit Event: '%s' by triggering the event without being in a server table"
+    "missedTable": "Player: %s attempted to exploit Event: '%s' by triggering the event without being in a server table",
+    "YouNeedMoreCops": "You Need %s More Police To Do This"
   },
 
   "coke": {
@@ -18,7 +13,6 @@
     "picking": "Picking Coca Leaf",
     "targetMakePow": "Make Cocaine Powder",
     "targetMakePowIcon": "fa-solid fa-seedling",
-    "noleaf": "You Need A Coke Leaf",
     "makePow": "Chopping Leaves into Powder",
     "targetCutCoke": "Cut Cocaine",
     "targetCutCokeIcon": "fa-solid fa-mortal-pestle",
@@ -28,8 +22,8 @@
     "teleInIcon": "fa-solid fa-door-closed",
     "teleOutIcon":"fa-solid fa-door-open",
     "teleOut": "Exit the Lab",
-    "needBakingSoda": "You Need Baking Soda For This",
-    "cutCokeAgain": "Cutting Cocaine With Baking Soda"
+    "cutCokeAgain": "Cutting Cocaine With Baking Soda",
+    "pickIcon": "fa-solid fa-seedling"
   },
 
   "Cornerselling": {
@@ -50,7 +44,8 @@
     "gotRobbed": "You Got Robbed Nerd!",
     "gotBack": "You Got Your Stuff Back!",
     "notEnough": "You Dont Have Enough Of This Item",
-    "comDes": "Sell Things On The Corner"
+    "comDes": "Sell Things On The Corner",
+    "notEnoughCops": "You Need %s More Police To Do This"
   },
 
   "crack": {
@@ -116,13 +111,13 @@
     "hasKitAlreadyPlaced": "You Already Have A Heroin Lab Kit Placed",
     "notEnoughMoney": "You Need $%s In Cash For This",
     "placedKit": "You Placed Down Your Heroin Lab Kit",
-    "failed": "You Failed To Make Heroin And Lost Your Ingredients"
+    "failed": "You Failed To Make Heroin And Lost Your Ingredients",
+    "pickIcon": "fa-brands fa-pagelines"
   },
 
   "lean": {
     "stealFromTruck": "Steal From Truck",
     "startMission": "Start Lean Mission",
-    "notOnRun": "You Are Not On A Lean Run",
     "alreadyChasing": "You Are Already Chasing A Truck",
     "carIcon": "fa-solid fa-truck-fast",
     "startMissionIcon": "fa-solid fa-hand-holding-medical",
@@ -136,23 +131,31 @@
 
   "lsd": {
     "targetHeat": "Heating LSD",
+    "targetHeatIcon": "fa-solid fa-temperature-high",
     "heating": "Heating Up LSD",
     "targetRefine": "Refine The Acid",
+    "targetRefineIcon": "fa-solid fa-vial",
     "refining": "Refining The Acid",
     "targetDipping": "Dip Tabs",
+    "targetDippingIcon": "fa-solid fa-droplet",
     "dipping": "Dipping Tabs",
     "targetPickup": "Pick Up Lab Kit",
+    "targetPickupIcon": "fas fa-box-circle-check",
     "packup": "Packing Up Lab Kit",
     "targetClean": "Clean Lab Kit",
-    "needCleaning": "You Need A Cleaning Kit To Clean The Lab",
+    "targetCleanIcon": "fa-solid fa-hand-sparkles",
     "cleaning": "Cleaning Lab Kit",
     "targetLys": "Steal Lysergic Acid",
+    "targetLysIcon": "fa-solid fa-vial",
     "stealLys": "Stealing Lysergic Acid",
     "targetDie": "Steal Diethylamide",
+    "targetDieIcon": "fa-solid fa-vial",
     "stealDie": "Stealing Diethylamide",
     "targetBuyTab": "Buy Tab Paper",
+    "targetBuyTabIcon": "fa-solid fa-hand-holding-dollar",
     "targetBuyKit": "Buy LSD Lab Kit",
-    "alreadyOwn": "You Already Own This Item",
+    "targetBuyKitIcon": "fa-solid fa-hand-holding-dollar",
+    "alreadyOwn": "You Already Own An LSD Lab Kit",
     "buyingKit": "Buying LSD Lab Kit",
     "tableout": "You Already Have A Table Out",
     "placing": "Placing Lab Kit Down!",
@@ -163,41 +166,59 @@
     "targetPick": "Pick Cactus",
     "picking": "Picking Cactus",
     "targetDry": "Dry Cactus",
-    "dry": "Drying Cactus"
+    "dry": "Drying Cactus",
+    "eat": "Taking Mescaline",
+    "pickIcon": "fa-solid fa-holly-berry"
   },
 
   "meth": {
     "alreadyChasing": "You Already Are Chasing A Truck",
     "targetStealFromCar": "Steal From Meth Car",
+    "targetStealFromCarIcon": "fa-solid fa-truck-fast",
     "targetHeist": "Start Meth Mission",
+    "targetHeistIcon": "fa-solid fa-user-secret",
     "started": "You Already Have Meth Cooking",
     "increaseHeat": "You Increased The Heat",
     "targetBag": "Bag Meth",
+    "targetBagIcon": "fa-solid fa-sack-xmark",
     "targetCook": "Cook Meth",
+    "targetCookIcon": "fa-solid fa-temperature-high",
     "targetGrabTray": "Grab Meth Tray",
+    "targetGrabTrayIcon": "fas fa-sign-in-alt",
     "targetHeat": "Adjust The Dials",
+    "targetHeatIcon": "fa-solid fa-temperature-three-quarters",
     "targetSmash": "Smash The Tray",
+    "targetSmashIcon": "fa-solid fa-hammer",
     "targetStealEPH": "Steal Ephedrine",
+    "targetStealEPHIcon": "fa-solid fa-vial",
     "stealingEPH": "Stealing Ephedrine",
     "targetStealACE": "Steal Acetone",
+    "targetStealACEIcon": "fa-solid fa-vial",
     "stealingACE": "Stealing Acetone",
-    "notOnRun": "You Are Not On A Meth Run",
-    "onCooldown": "You Are On A Cooldown",
     "teleIn": "Enter the Lab",
-    "teleOut": "Exit the Lab"
+    "teleInIcon": "fa-solid fa-door-open",
+    "teleOutIcon":"fa-solid fa-door-closed",
+    "teleOut": "Exit the Lab",
+    "wrongVehModel": "Player: %s Passed A Vehicle Model: %s for Meth Van but The Proper Vehicle Model is: %s ",
+    "notOnRun": "Player: %s attempted to exploit the meth run event by triggering the event when not on a meth run.",
+    "finishedRun": "You Have Finished Your Meth Run"
   },
 
   "oxy": {
     "ditchCar": "The Van Is Hot, Leave It Somewhere",
     "targetHandoff": "Hand Off The Package",
+    "targetHandOffIcon": "fa-solid fa-box-open",
     "handingoff": "Handing Off The Package",
     "emptyHands": "You Are Not Carrying Anything",
     "targetPay": "Rent Oxy Van",
+    "targetPayIcon": "fa-solid fa-hand-holding-dollar",
     "keys": "The Keys Are In The Van",
     "targetGetPackage": "Grab Package",
+    "targetGetPackageIcon": "fa-solid fa-box-open",
     "alreadyCarrying": "You Are Already Carrying A Package",
-    "paid": "You Paid $%s To Rent The Van",
-    "notOn": "You Are Not On A Route"
+    "notOn": "You Are Not On A Route",
+    "notOnOxyRun": "Player: %s attempted to exploit the oxy run event by triggering the give event when not on an oxy run.",
+    "mismatchOxyVan": "Player: %s Passed Vehicle: %s for Oxy Van but The Proper Vehicle is: %s "
   },
 
   "pharma": {
@@ -211,7 +232,8 @@
     "targetFill": "Fill Prescription",
     "fill": "Getting Prescription Filled",
     "canceled": "You Canceled The Prescription",
-    "unbottle": "You Opened The Bottle"
+    "unbottle": "You Opened The Bottle",
+    "fillIcon": "fa-solid fa-prescription-bottle-medical"
   },
 
   "shrooms": {
@@ -219,11 +241,13 @@
     "picking": "Picking Shrooms",
     "eat": "Eating Shrooms",
     "cancel": "Decided To Not Do Shrooms",
-    "took": "You Took Some Shrooms!"
+    "took": "You Took Some Shrooms!",
+    "pickIcon": "fa-solid fa-mushroom"
   },
 
   "weed": {
     "targetPick": "Pick Weed",
+    "targetDryIcon": "fa-solid fa-temperature-high",
     "picking": "Picking Weed",
     "targetDry": "Dry Weed",
     "noDry": "You Need Wet Weed For This",
@@ -234,12 +258,21 @@
     "teleportOut": "Leave The Grow House",
     "dabs": "Doing Some Dabs",
     "bluntWrap": "Dipping Syrup To Make %s",
-    "rollBlunt": "Rolling A %s",
     "targetSales": "Buy From Dealer",
+    "salessHeader": "Weed Salesman",
+    "salesIcon": "fa-solid fa-handshake",
+    "salesHeader": "Amount To Buy",
+    "salesDesc": "how Many Do You Wish To Buy?",
     "buying": "Buying %s From Dealer",
-    "itemDoesntExist": "This Item Does Not Exist Here",
     "needItem": "You Need A %s For This",
-    "crackBlunt": "Cracking Open A Blunt"
+    "crackBlunt": "Cracking Open A Blunt",
+    "pickIcon": "fa-solid fa-cannabis",
+    "teleportInIcon": "fa-solid fa-door-open",
+    "teleportOutIcon":"fa-solid fa-door-closed",
+    "cannabisIcon": "fa-solid fa-cannabis",
+    "itemDoesntExistWarn": "Player: %s attempted to exploit the weed salesman event by trying to purchase an item that does not exist in the weed salesman: %s",
+    "invalidTableWarn": "Player: %s attempted to exploit the weed event by triggering the event with an invalid recipe table butter/oil.",
+    "recipeDoesntExistWarn": "Player: %s attempted to exploit the weed event by triggering the event with a non existent recipe name: %s."
   },
 
   "wholesale": {
@@ -255,35 +288,75 @@
   "xtc": {
     "alreadyOut": "You Have A Press Out Already",
     "settingDown": "Setting Down The Press",
-    "noPressOut": "You Do Not Have A Press Out",
     "targetMake": "Press Pills",
+    "pressIcon": "fa-solid fa-pills",
     "making": "Pressing A %s",
     "targetPickup": "Pick Up Press",
+    "targetPickupIcon": "fa-solid fa-hand-holding",
     "picking": "Picking Up Press",
     "targetStealMDP2P": "Steal MDP2P",
+    "mdp2pIcon": "fa-solid fa-vial",
     "stealingMDP2P": "Stealing MDP2P",
-    "fail": "Damn Dude You Suck",
     "targetStealIsosafrole": "Steal Isosafrole",
+    "isosafroleIcon": "fa-solid fa-vial",
     "stealingIsosafrole": "Stealing Isosafrole",
     "targetRaw": "Make Raw XTC",
+    "rawIcon": "fa-solid fa-hand-scissors",
     "makingRaw": "Making Raw XTC",
     "getPress": "Get Press",
     "buySingle": "Buy Single Press For $%s",
     "buyp": "Buying Press",
     "targetStamp": "Stamp XTC",
+    "stampIcon": "fa-solid fa-stamp",
     "stamp_desc": "Stamp %s Pills",
     "stamping": "Stamping %s Pills",
-    "noPills": "You Dont Have Any Unstamped Pills"
+    "noPills": "You Dont Have Any Unstamped Pills",
+    "noActivePress": "Player: %s attempted to exploit the xtc event by trying to stamp pills without having an active press."
   },
 
   "merchant": {
-    "targetOpen": "Open Merchant Menu"
+    "targetOpen": "Open Merchant Menu",
+    "targetIcon": "fa-solid fa-shop",
+    "menuTitle": "Travelling Merchant",
+    "itemDoesntExist": "Player: %s attempted to exploit the merchant event by trying to purchase an item that does not exist in the merchant: %s"
   },
 
   "Whippit": {
     "targetShop": "Open Whippit Shop",
     "needBalloon": "You Need A Balloon For This",
     "needCanister": "You Need A Canister For This",
-    "shopHeader": "Whippit Shop"
+    "shopHeader": "Whippit Shop",
+    "whippitIcon": "fa-solid fa-cart-shopping",
+    "invalidItemWarn": "Player: %s attempted to exploit the whippit shop event by trying to purchase an item that does not exist in the whippit shop: %s"
+  },
+  "Dispatch": {
+    "header": "Drug Activity",
+    "code": "4-2-0",
+    "icon": "fas fa-exclamation-triangle"
+  },
+  "DrugRep": {
+    "header": "Drug Reputation",
+    "increased": "Your Current Drug Reputation Stats",
+    "coke": {
+      "icon": "fa-solid fa-face-flushed",
+      "title": "Cocaine: %s"
+    },
+    "heroin": {
+      "icon": "fa-solid fa-syringe",
+      "title": "Heroin: %s"
+    },
+    "lsd": {
+      "icon": "fa-solid fa-vial",
+      "title": "LSD: %s"
+    },
+    "dealerrep": {
+      "icon": "fa-solid fa-plug",
+      "title": "Dealer: %s"
+  },
+  "cornerselling": {
+    "icon": "fa-solid fa-money-bill",
+    "title": "Corner Selling: %s",
+    "description": "Rank: %s"
+  }
   }
 }
diff --git a/server/TravellingMerchant.lua b/server/TravellingMerchant.lua
index be2a587..04bfb84 100644
--- a/server/TravellingMerchant.lua
+++ b/server/TravellingMerchant.lua
@@ -50,7 +50,7 @@ RegisterServerEvent("md-drugs:server:purchaseGoods", function(item)
 		return
 	end
 	if not stores.travel[item] then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Catches.invalidItem'), "error")
+		Bridge.Prints.Warn(Bridge.Language.Locale('merchant.itemDoesntExist', Bridge.Framework.GetPlayerIdentifier(src), item))
 		return
 	end
 	if Bridge.Framework.RemoveAccountBalance(src, 'cash', stores.travel[item]) then
diff --git a/server/cornerselling.lua b/server/cornerselling.lua
index e5552c3..3f01bd1 100644
--- a/server/cornerselling.lua
+++ b/server/cornerselling.lua
@@ -276,7 +276,7 @@ end)
 RegisterCommand('cornersell', function(source, args, raw)
     local src = source
     if #Bridge.Framework.GetPlayersByJob('police') < cornsellConfig.policeRequired then
-        Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Catches.noCops'), 'error')
+        Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Cornerselling.notEnoughCops', cornsellConfig.policeRequired - #Bridge.Framework.GetPlayersByJob('police')), 'error')
         return
     end
     TriggerClientEvent('md-drugs:client:cornerselling', src)
diff --git a/server/lsd.lua b/server/lsd.lua
index 200582d..4a5e3da 100644
--- a/server/lsd.lua
+++ b/server/lsd.lua
@@ -185,7 +185,7 @@ RegisterServerEvent('md-drugs:server:gettabpaper', function(num)
 		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Catches.notEnoughMoney'), "error")
 	end
 end)
- 
+
 RegisterServerEvent('md-drugs:server:getlabkit', function(num)
 	local src = source
 	if timeOut(src, 'md-drugs:server:getlabkit') then return end
diff --git a/server/meth.lua b/server/meth.lua
index c933712..105d0f1 100644
--- a/server/meth.lua
+++ b/server/meth.lua
@@ -59,17 +59,20 @@ RegisterServerEvent('md-drugs:server:givemethingridients', function(veh)
 
 	local vehicle = NetworkGetEntityFromNetworkId(veh)
 	if vehicles[src] ~= vehicle then
-		return Bridge.Notify.SendNotify(src, Bridge.Language.Locale('meth.noVehicle'), "error")
+		Bridge.Prints.Warn(Bridge.Language.Locale('meth.noVehicle', Bridge.Framework.GetPlayerIdentifier(src), vehicle, vehicles[src]))
+		return
 	end
 
 	if not DoesEntityExist(vehicle) and GetEntityModel(vehicle) == GetHashKey('journey') then
-		return Bridge.Notify.SendNotify(src, Bridge.Language.Locale('meth.noVehicle'), "error")
+		Bridge.Prints.Warn(Bridge.Language.Locale('meth.wrongVehModel', Bridge.Framework.GetPlayerIdentifier(src), GetEntityModel(vehicle), 'journey'))
+		return
 	end
-	
+
 	if timeOut(src, 'md-drugs:server:givemethingridients') then return end
 
 	if not onRun[src] then
-		return Bridge.Notify.SendNotify(src, Bridge.Language.Locale('meth.notOnRun'), "error")
+		Bridge.Prints.Warn(Bridge.Language.Locale('meth.notOnRun', Bridge.Framework.GetPlayerIdentifier(src)))
+		return
 	end
 	onRun[src] = onRun[src] + 1
 
@@ -119,7 +122,6 @@ end)
 Bridge.Callback.Register('md-drugs:server:startcook', function(source, num)
 	local src = source
 	if not checkDistance(src, Locations.Meth.CookMeth[num].loc, 2.5, 'md-drugs:server:startcook') then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Catches.notIn'), "error")
 		return false
 	end
 	if not craft(src, Recipes.Meth.cook.heat) then
diff --git a/server/oxyruns.lua b/server/oxyruns.lua
index c29a463..cfddbc4 100644
--- a/server/oxyruns.lua
+++ b/server/oxyruns.lua
@@ -31,6 +31,9 @@ GlobalState.MDDrugsLocations = Locations
 Bridge.Callback.Register('md-drugs:server:payfortruck', function(source, loc)
 	local src = source
 	if timeOut(src, 'md-drugs:server:payfortruck') then return false end
+	if onRoute[src] then
+		return false
+	end
 	if not checkDistance(src, Locations.Oxy.OxyPayForTruck[loc].loc, 2.0, 'md-drugs:server:payfortruck') then
 		return false
 	end
@@ -50,7 +53,7 @@ RegisterServerEvent('md-drugs:server:giveoxybox', function()
 	local src = source
 	if timeOut(src, 'md-drugs:server:giveoxybox') then return end
 	if not onRoute[src] then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('oxy.notOn'), "error")
+		Bridge.Prints.Warn(Bridge.Language.Locale('oxy.notOnOxyRun', Bridge.Framework.GetPlayerIdentifier(src)))
 		return
 	end
 
@@ -58,14 +61,13 @@ RegisterServerEvent('md-drugs:server:giveoxybox', function()
 		return
 	end
 
-	local vehicles = vehicles[src]
-	if not vehicles or GetEntityModel(vehicles) ~= GetHashKey("burrito3") then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('oxy.notInVeh'), "error")
+	local vehicle = vehicles[src]
+	if not vehicle or GetEntityModel(vehicle) ~= GetHashKey("burrito3") then
+		Bridge.Prints.Warn(Bridge.Language.Locale('oxy.mismatchOxyVan', Bridge.Framework.GetPlayerIdentifier(src), vehicle, vehicles[src]))
 		return
 	end
 
-	if #(GetEntityCoords(vehicles) - GetEntityCoords(GetPlayerPed(src))) > 35.0 then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('oxy.notNearVeh'), "error")
+	if not checkDistance(src, GetEntityCoords(vehicle), 35.0, 'md-drugs:server:giveoxybox') then
 		return
 	end
 
diff --git a/server/pharma.lua b/server/pharma.lua
index b1dab02..5b53f81 100644
--- a/server/pharma.lua
+++ b/server/pharma.lua
@@ -17,14 +17,12 @@ local function getNearby(src, distance)
 	local players = Bridge.Framework.GetPlayers()
 	local nearPlayers = {}
 	for index, sources in pairs(players) do
-		--if sources ~= src then
-			local target = GetEntityCoords(GetPlayerPed(sources))
-			local you = GetEntityCoords(GetPlayerPed(src))
-			local distanceBetween = #(you - target)
-			if distanceBetween <= distance then
-				table.insert(nearPlayers, {label = Bridge.Framework.GetPlayerName(sources), value = sources})
-			end
-		--end
+		local target = GetEntityCoords(GetPlayerPed(sources))
+		local you = GetEntityCoords(GetPlayerPed(src))
+		local distanceBetween = #(you - target)
+		if distanceBetween <= distance then
+			table.insert(nearPlayers, {label = Bridge.Framework.GetPlayerName(sources), value = sources})
+		end
 	end
 	return nearPlayers
 end
diff --git a/server/weed.lua b/server/weed.lua
index d414dea..d296b98 100644
--- a/server/weed.lua
+++ b/server/weed.lua
@@ -111,7 +111,7 @@ RegisterNetEvent('md-drugs:server:buyWeedItem', function(loc, name, amount)
         return
     end
     if not Recipes.Weed.weedStore[name] then
-        Bridge.Notify.SendNotify(src, Bridge.Language.Locale('weed.itemDoesntExist'), "error")
+        Bridge.Prints.Warn(Bridge.Language.Locale('weed.itemDoesntExistWarn', Bridge.Framework.GetPlayerIdentifier(src), name))
         return
     end
 
@@ -152,7 +152,7 @@ RegisterServerEvent('md-drugs:server:MakeWeedItems', function(tabl, item, loc)
     if timeOut(src, 'md-drugs:server:MakeWeedItems') then return end
     local locs = tabl == 'makeButter' and 'MakeButter' or tabl == 'makeOil' and 'MakeOil' or nil
     if not locs then
-        Bridge.Notify.SendNotify(src, Bridge.Language.Locale('weed.invalidTable'), "error")
+        Bridge.Prints.Warn(Bridge.Language.Locale('weed.invalidTableWarn', Bridge.Framework.GetPlayerIdentifier(src), tabl))
         return
     end
     if not checkDistance(src, Locations.Weed[locs][loc].loc, 5.0, 'md-drugs:server:MakeWeedItems') then
@@ -160,7 +160,7 @@ RegisterServerEvent('md-drugs:server:MakeWeedItems', function(tabl, item, loc)
     end
     local recipe = Recipes.Weed[tabl][item]
     if not recipe then
-        Bridge.Notify.SendNotify(src, Bridge.Language.Locale('weed.itemDoesntExist'), "error")
+        Bridge.Prints.Warn(Bridge.Language.Locale('weed.recipeDoesntExistWarn', Bridge.Framework.GetPlayerIdentifier(src), item))
         return
     end
     for k, v in pairs (recipe.recipe) do
diff --git a/server/whippit.lua b/server/whippit.lua
index 4b8ac24..87bc7d4 100644
--- a/server/whippit.lua
+++ b/server/whippit.lua
@@ -31,8 +31,17 @@ GlobalState.MDDrugsRecipes = Recipes
 
 RegisterServerEvent('md-drugs:server:buyWhippitItem', function(loc, item,amount)
     local src = source
-    if not checkDistance(src, Locations.Whippit[loc].loc, 3.0, 'md-drugs:server:buyWhippitItem') then return end
-    if not Recipes.Whippit.shop[item] then return end
+
+    if timeOut(src, 'md-drugs:server:buyWhippitItem') then return end
+
+    if not checkDistance(src, Locations.Whippit[loc].loc, 3.0, 'md-drugs:server:buyWhippitItem') then
+        return
+    end
+
+    if not Recipes.Whippit.shop[item] then
+        Bridge.Prints.Warn(Bridge.Language.Locale('Whippit.invalidItemWarn', Bridge.Framework.GetPlayerIdentifier(src), item))
+        return
+    end
     local price = Recipes.Whippit.shop[item] * amount
     if not Bridge.Framework.RemoveAccountBalance(src, 'cash', price, 'whippit-shop') then
         return Bridge.Notify.SendNotify(src, Bridge.Language.Locale('Whippit.notEnoughMoney', price), 'error')
diff --git a/server/xtc.lua b/server/xtc.lua
index 868a57c..cc8275e 100644
--- a/server/xtc.lua
+++ b/server/xtc.lua
@@ -106,7 +106,9 @@ RegisterServerEvent('md-drugs:server:getpressback', function()
 	local src = source
 	if not activePresses[src] then return end
 	local press = activePresses[src]
-	if not checkDistance(src, press.loc, 2.0,'md-drugs:server:getpressback' ) then return end
+	if not checkDistance(src, press.loc, 2.0,'md-drugs:server:getpressback' ) then
+		return
+	end
 	Bridge.Inventory.AddItem(src, press.get, 1)
 	activePresses[src] = nil
 end)
@@ -114,11 +116,13 @@ end)
 RegisterServerEvent('md-drugs:server:makextc', function(data)
   	local src = source
   	if not activePresses[src] then
-		Bridge.Notify.SendNotify(src, Bridge.Language.Locale('xtc.noPressOut'), 'error')
+		Bridge.Prints.Warn(Bridge.Language.Locale('xtc.noActivePress', Bridge.Framework.GetPlayerIdentifier(src)))
 		return
   	end
 	if timeOut(src, 'md-drugs:server:makextc') then return end
-	if not checkDistance(src, activePresses[src].loc, 2.0, 'md-drugs:server:makextc') then return end
+	if not checkDistance(src, activePresses[src].loc, 2.0, 'md-drugs:server:makextc') then
+		return
+	end
 	if not craft(src, Recipes.XTC[activePresses[src].press][data]) then
 		return
 	end