More ui fixes