Fixed the email address and some alignment issues