Google Analytics tracking + some js changes