PIM-3144: polishing UI