More UI fixes.