Updated UI, Adapted for the new interface