Improved calendar view and chart data