error fixes
Merge branch 'View' into dev