Fix datepicker and transitions