Minor fixes
NextGen Form Renderer POC