Change 'days until' calculation to use calendar days