Better handling of multiple calendars and add container option to embed the calendar