Fix and add google analytics