Calendar redesign, mainly