form redesign first pass