Fix logic for total
Modify style
Format date