Refactored calendar view, only working with dates now, no time involved