fixes views
fixes views
Merge branch 'master' into UI-format
fixes views format