Added remove button, fixed the data model when creating events to properly add icon

Added remove button, fixed the data model when creating events to properly add icon