added template tag to format date, cleanup