More UI fixes & improvements.