Updated UI slightly