more ui fixes