#31, #32 integrating canvas and datepicker