Updated UI for setup