Add Profile diagrams to CC/QA, Add highlight for annotations