basic view
Merge branch 'feature/view'