Update index, calendar pages to use calendar :S