OFC-1271 - Use new form layout to render forms - Work in progress, code
clean