cdr-ui changes - post review