Added view for adding events(still errors)
Fixed merge conflict