Changed layout and date format