moved views to generic file
Merge branch 'master' into dev