ui changes
conflict resolved