staging
Fixing issues with view