improved location picker