Service template tweaks

Modify service template to improve user experience as discussed with Tim