Further improvements for calendar