rewrite cfp section, lots of cleanup

[naugtur]

Please take a look, change if needed and deploy.

I'd like to get that deployed before the end of the week.