added some ui fixes