diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
index f3a86f2..e96dc25 100644
--- a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
+++ b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
@@ -214,8 +214,8 @@ beatrun.toolsmenu.gamemodes.deathmatch=Toggle Deathmatch Gamemode
 # Checkpoints
 beatrun.checkpoints.countdown1=Ready
 beatrun.checkpoints.countdown2=Set
-beatrun.checkpoints.countdown3=GO!
-beatrun.checkpoints.speedometer=%s km/h
+beatrun.checkpoints.countdown3=Go!
+beatrun.checkpoints.speedometer=km/h
 
 # DataTheft
 beatrun.datatheft.name=Data Theft (%s)
diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
index 02d3a9d..411f882 100644
--- a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
+++ b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
@@ -215,7 +215,7 @@ beatrun.toolsmenu.gamemodes.deathmatch=Переключить Deathmatch
 beatrun.checkpoints.countdown1=Раз
 beatrun.checkpoints.countdown2=Два
 beatrun.checkpoints.countdown3=ПОШЁЛ!
-beatrun.checkpoints.speedometer=%s км/ч
+beatrun.checkpoints.speedometer=км/ч
 
 # DataTheft
 beatrun.datatheft.name=Data Theft (%s)
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
index 6f09846..03d9fda 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Checkpoints.lua
@@ -21,7 +21,7 @@ if SERVER then
 	util.AddNetworkString("Checkpoint_Hit")
 	util.AddNetworkString("Checkpoint_Finish")
 else
-	surface.CreateFont("BeatrunHUD", {
+	surface.CreateFont("BeatRoboto", {
 		shadow = false,
 		blursize = 0,
 		underline = false,
@@ -233,34 +233,47 @@ function CourseHUD()
 	local incourse = Course_Name ~= ""
 	local totaltime = CheckpointNumber ~= -1 and math.max(0, CurTime() - Course_StartTime) or Course_EndTime
 
+	
+	--text = language.GetPhrase("beatrun.checkpoints.speedometer")
+	PlayingCourse = false
+	ShowFreeplaySpeed = false
+	if incourse and not BuildMode then
+		PlayingCourse = true
+	elseif GetConVar("Beatrun_HUDHidden") and not GetConVar("Beatrun_HUDHidden"):GetBool() and not BuildMode then
+		ShowFreeplaySpeed = true
+	end
+	if (PlayingCourse or ShowFreeplaySpeed) and hook.Run("BeatrunDrawHUD") ~= false and not ply.InReplay then
+        local speed = math.Round(ply:GetVelocity():Length2D() * 0.06858125)
+		text = language.GetPhrase("beatrun.checkpoints.speedometer")
+
+        surface.SetFont("BeatRoboto")
+
+        surface.SetTextColor(255, 255, 255, 255)
+
+        if speed < 10 then
+            speed = "0" .. speed .. " "
+        elseif speed < 100 then
+            speed = speed .. " "
+        end
+        
+        w, h = surface.GetTextSize(text)
+
+		w = w or 0 -- Backported, no clue what this does
+		
+        -- Visually "accurate" speedometer (number can overlap with km/h text)
+        surface.SetTextPos(ScrW() * 0.8469 + vpx, ScrH() * 0.85 + vpz)
+        surface.DrawText(text)
+        surface.SetTextPos(ScrW() * 0.8469 - 35.712 * (ScrH() / 1080) + vpx, ScrH() * 0.85 + vpz)
+        surface.DrawText(speed)
+    end
+
 	if incourse then
 		local text = string.FormattedTime(totaltime, "%02i:%02i:%02i")
 		local w, _ = surface.GetTextSize(text)
 		surface.SetTextPos(ScrW() * 0.85 - w * 0.5 + vpx, ScrH() * 0.075 + vpz)
 		surface.DrawText(text)
 	end
-
-	if GetConVar("Beatrun_HUDHidden") and not GetConVar("Beatrun_HUDHidden"):GetBool() and not BuildMode and hook.Run("BeatrunDrawHUD") ~= false and not ply.InReplay then
-		local speed = math.Round(ply:GetVelocity():Length2D() * 0.06858125) -- 2D speed, ME-style (:Length2D() instead of just :Length())
-
-		if speed < 10 then
-			speed = "0" .. speed
-		end
-
-		text = language.GetPhrase("beatrun.checkpoints.speedometer"):format(speed)
-
-		local w, _ = surface.GetTextSize(text)
-		w = w or 0
-
-		local r, g, b, a = string.ToColor(GetConVar("Beatrun_HUDTextColor"):GetString())
-
-		surface.SetDrawColor(255, 255, 255, 255)
-		surface.SetFont("BeatrunHUD")
-		surface.SetTextColor(r, g, b, a)
-		surface.SetTextPos(ScrW() * 0.85 - w * 0.5 + vpx, ScrH() * 0.85 + vpz)
-		surface.DrawText(text)
-	end
-
+	
 	if incourse and pbtimes then
 		local text = string.FormattedTime(pbtotal, "%02i:%02i:%02i")
 		local w, h = surface.GetTextSize(text)