Added modal support to Calendar