design glitches, date helper improved