Added DayView handling