FORUM-257 | PLF4 - UI defects on relooking branch