Several small ui improvements