new views
Merge branch 'develop'