Add GA and add info to index
Merge origina master and production changes