lots of ui improvements