some ui fixes
merge