Added calendar tweaks