Improve form generator