Modified enter to save edit, and esc to cancel edit