Updates to use Google Universe page tracking
update from develop