Lots and lots of UI improvements