mostly UI improvements