Update GA tracking
Some changes