Improved calendar view