Updated MonthCalendarVi refactored more --Chris