OFC-1271 - Use new form layout to render forms

Code clean, renamed classes according to new UI Model