CRM-13296 button changes per Dave'd advice