Merge pull request #348 from walmartlabs/user/eran

View refactor
Fixing issue with layouts not working
Merge pull request #350 from wpreul/bug/views

Fixing issue with layouts not working
Merge layout fix