Draft of updated Edit sections forms