DRY up date rendering
Fix HTML markup