ECMS-4533: Refine UI for the CLV Preferences