More style improvements to Calendar