Fixed the UI. The delay is messing up