Command Create and Edit commands modified for ok-cancel.