[olliewagner]

I would imagine that the operators of the current UI were trained on it as well. What the OP posted is certainly an improvement, but could be made bulletproof by showing each choice in context alongside a button that you can't accidentally trigger.