small ui changes
merge
merge
new icon
merge