removed unneccesarry classses. added event callout box
cleaned up merge conflict and included new content