fix markup issues and add Google analytics