fix email content
fix new order layout