UI fixes [TASKS] 2252, 2233, 2261, 2269.