Refactoring new event view