few more ui fixes