CPL's UI changes