Added ordering to calendar