design and form2 fixes