more UI fixes