Fix some pages + work on CFP.