Fixes to rendered forms
Merge branch 'render-fix' of github.com:jaydchan/tawny-owl into jaydchan-render-fix