some ui fixes