Added new markup with custom element classes for events