HUD BP refactor