ui changes
merge conflicts resolved