polishing UI some more