Changed the form to be more like CV