Refactored Calendar
More refactoring
Added student and updated views