Add Google (Universal) analytics and rework logic