Fixed the calendar navigation not working correctly