Updated calendar layout