As for having the service name in the button, I’ve read somewhere that it’s better to be explicit in the buttons so that the user doesn’t have to look up at the service name and then back to the button to figure out which service that button will actually modify. All the buttons in Cork follow this system; maybe it’s a bit awkward and noticeable due to the two buttons being next to each other, so let’s see what can be done about that (2/3)