ECMS-4830:PLF4 - UI defects on relooking branch