Fixed datepickers to work much better