added date grouping
added more formatting