Now uses separate blocks for the "default" and "cancel" buttons.