Updated form submission and email template