Lots of improvements to appearance of UI