several ui improvements