Add GA event tracking and clean up some JS