further improvements on calendar view
further improvements on calendar view