Update date to be 7 days including today
Clean up date format