Refactored Calendar view