Task/more ui improvements