Add country selector, extra validation for schools