Redesigning the country selector