WIP: Punch up New/Edit form field sizing / margining