several UI improvements