ECMS-4803 PLF4 - UI defects on relooking branch