massive refactory of calendar model, radio buttons to select calendars