changes to viewS
Merge branch 'develop'