#20 fixed the collapsing datepicker