Initial calendar tweaks