Cleaned up how Buttons are added to the HUD