fix and revamp datebox