Added Google analytics

And other small changes