diff --git a/README.md b/README.md
index c1882150..cc46a37a 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
 # esx_taxijob
 
+ESX Taxi Job adds driving cabs as a service, and more including NPC missions.
+
 ## Requirements
 
 * Auto mode
   * [esx_service](https://github.com/ESX-Org/esx_service)
-  
+
 * Player management (billing and boss actions)
   * [esx_society](https://github.com/ESX-Org/esx_society)
   * [esx_billing](https://github.com/ESX-Org/esx_billing)
@@ -38,7 +40,7 @@ start esx_taxijob
 ### License
 esx_taxijob
 
-Copyright (C) 2015-2018 Jérémie N'gadi
+Copyright (C) 2015-2020 Jérémie N'gadi
 
 This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version.
 
diff --git a/client/main.lua b/client/main.lua
index debf7487..becd6c01 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -27,12 +27,12 @@ function ShowLoadingPromt(msg, time, type)
 	Citizen.CreateThread(function()
 		Citizen.Wait(0)
 
-		BeginTextCommandBusyString('STRING')
+		BeginTextCommandBusyspinnerOn('STRING')
 		AddTextComponentSubstringPlayerName(msg)
-		EndTextCommandBusyString(type)
+		EndTextCommandBusyspinnerOn(type)
 		Citizen.Wait(time)
 
-		RemoveLoadingPrompt()
+		BusyspinnerOff()
 	end)
 end
 
@@ -108,15 +108,13 @@ end
 function OpenCloakroom()
 	ESX.UI.Menu.CloseAll()
 
-	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'taxi_cloakroom',
-	{
+	ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'taxi_cloakroom', {
 		title    = _U('cloakroom_menu'),
 		align    = 'top-left',
 		elements = {
-			{ label = _U('wear_citizen'), value = 'wear_citizen' },
-			{ label = _U('wear_work'),    value = 'wear_work'}
-		}
-	}, function(data, menu)
+			{label = _U('wear_citizen'), value = 'wear_citizen'},
+			{label = _U('wear_work'),    value = 'wear_work'}
+	}}, function(data, menu)
 		if data.current.value == 'wear_citizen' then
 			ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
 				TriggerEvent('skinchanger:loadSkin', skin)
@@ -155,8 +153,7 @@ function OpenVehicleSpawnerMenu()
 				})
 			end
 
-			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner',
-			{
+			ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner', {
 				title    = _U('spawn_veh'),
 				align    = 'top-left',
 				elements = elements
@@ -176,7 +173,6 @@ function OpenVehicleSpawnerMenu()
 				end)
 
 				TriggerServerEvent('esx_society:removeVehicleFromGarage', 'taxi', vehicleProps)
-
 			end, function(data, menu)
 				CurrentAction     = 'vehicle_spawner'
 				CurrentActionMsg  = _U('spawner_prompt')
@@ -188,11 +184,10 @@ function OpenVehicleSpawnerMenu()
 
 	else -- not society vehicles
 
-		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner',
-		{
-			title		= _U('spawn_veh'),
-			align		= 'top-left',
-			elements	= Config.AuthorizedVehicles
+		ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner', {
+			title    = _U('spawn_veh'),
+			align    = 'top-left',
+			elements = Config.AuthorizedVehicles
 		}, function(data, menu)
 			if not ESX.Game.IsSpawnPointClear(Config.Zones.VehicleSpawnPoint.Pos, 5.0) then
 				ESX.ShowNotification(_U('spawnpoint_blocked'))