Improvements in new HUD (WIP)