Some more UI fixes.