[#80155508] Completes 508 Updates

Updates per Nick's 508 feedback on emails.