[TIMETABLE] Redesign events in timetable