Updated calendar page and layout