calendar a little cleaner and the date format is changed