Changed everything back to buttons.  Added the cancel buttons to the views that were missing them.