Change logic of displaying events
Remove events prerendering
Refactoring