getting more done on views
merge with frontend3
Merge branch 'frontend3'