Partial fixes for the Service button dialog issue

Issue 163: To be reviewed by Eric & Kay