Added in more fields, made HTML form easier to edit