Some UI fixes.