some more ui improvements