Fixes issues with the email button. Still needs fixing on the layout though - mrracine