First part of moving the UI in service options over to new design

As part of this I created a component for the service option selector to
reuse in the 2-3 places it may be used.