Few UI fixes.