New iteration on form ux, addressing issues noted in #433