Remove extra whitespace
Move the calendar to its own controller