Even more UI fixes.