Extracted the calendar into it's own action/view