Added country selection and currently removed searching capability