Finished HUD refactoring