[OE-4006] - changed form and view to adapt with recent changes