Fix event creation
Add event timeline