edit form restructuring