WIKI-377 PLF4 - UI defects on relooking branch