Adds CV and some re-org of links