Changes to make date formatting standard in one place.

Also change logic to include date if over 1 day, and year if over 300 days