Emails & Order Detail Page fixes