Implemented new UI. Still need to rename vars.