Updated Website and Email Templates