HUD tweaks and fixes