lots of ui changes