Adding Google Analytics and some change