Fix slug, add calendar