[Finish #45077277] Reorganize calendar headers