View files fixes
View files fixes