Updated UI layouts