Hotfixes for service button and service method dialog

issue 163 (partial fixes)
issue 160 (completed)
for review by Eric and Kay