refactored views
Merge branch 'dev'