ui changes
Merge branch 'views'
merge