start of form markup rework