more ui improvements