minor improvements to service choice form