fix field generation and form rendering