multiple UI fixes