re-organized cv_form

We'll need to do some work on the UI aspects of this page.