Updated with @viorela click fix, updated events metrics to match new functionality, added event goals