[OE-3945] Fixed import paths
[OE-3945] Layout fixes
[OE-3945] Use the views specified in the model