Added Whenever, corrected display and showed number of days left