Some changes to display date correctly and save the date.