form2 refactoring to use function calls on render
Merge branch 'master' of github.com:yfix/yf