adding google analytics to layout, plus other minor changes