fixed bug
now with datepicker