lots of ui updates