Updated UI Class