some more ui fixes