updated content and email pages and panels
GRRRRRRRRR!!!!!!!!!!!!!!!!!!!!!!

This Git stuff is getting frusterating.
Scassdasd
Had to manually merge content and email updates