Finished the calendar view
Fixed conflicts