Hotfixes for service button and service method dialog

issue 163 
issue 160
for review by Eric and Kay