Refactoring HUD (WIP)