More work on editable forms