CRM-15367 - Standardize buttons for option edit screens