RA-304 Post review UI fixes