Refactored HUD and game state