Event views
Fixed conflicts