several UI fixes and changes