Add some more fields to organization sign up, reorder other fields