Fix Calendar View