refactor cdr views