Rework the calendar view
Merge branch 'calendar'