Added separate blocks for "default" and "cancel" buttons.

Added separate blocks for "default" and "cancel" buttons.