Redesigned location selection