Modified add and edit layout.  Added 'Cancel' buttons.