ui changes
Merge branch 'devel'