Remove reundant divs, fix class of email div