Uses new view syntax
Merge branch 'hotfix/view_syntax'