updated database model for new form fields
updated formatting