improved ModalEditable