Add resource view
Merge branch 'ui'