Fixed new line in subject
Made edits to email template
Made more edits to email template