Improve district sign-up flow