Calendar: Fixed display and contrast issues