re-integrated calendar view