change calendar singleton and add home route