Added google analytics + other changes