Fix analytics and add some more analytics markup