Fixed the date to display proper format and date