[OE-3945] Fixed import paths
[OE-3945] Layout fixes