(bug 42440) Fix button state when canceling

Also changed class names to make finding cancel buttons easier.

Change-Id: Ieaf242eb03add06038307d913a87a196d41ba01d