Uses the latest Email Comp (Html+Text)
Improve CFP pages
General Polishing