Some final UI polishing.