some ui modifications
merge