[TASK] RT-2225: UI Fixes and improvements after rebase