DONE FIXING UI!