WIP: refactor envelope form fields