[OE-3945] Fixing layout