Made leaps and bounds on the ui