Added continent/country picking