+EventsList, WeekWidget bag code refactoring