Some more UI fixes