adjusted views to allow for using custom templates
Merge branch 'dev'