More UI polishing.