reworked edit form