ui fixes
merge