Modified view property, now it's a template
Merge branch 'feature/property'