Even more UI fixes