Added analytics tags and event tracking