Added analytics to more pages