improve layout, and make "service" a radio button (with "live" and "test" options)