Making some ui fixes