Remove triggerRouter, add GA to click event as well