Updated UI - STILL NOT GOOD