Added more GA event tracking