lots of UI improvements