Final cross client tweaks
Cross client and design tweaks
Update test email addresses
Typo edit
back to testing/Joel email addresses