ECA classes refactor, event form display