further improvements on calendar view