Adapt to new layout + better gCalendar maps