#196 more robust form markup using tables