Merge pull request #1 from dreadheadnation/calendar

Calendar
Merge pull request #2 from mando20/calendar

fix calander UI issue
update calendar