Polishing UI some more.