Adding better tracking to google ga