some ui fixes|