[TASK] RT-2416, RT-2417 UI fixes