Added more required fields
Clear seperation between preview and email forms