Updated loading of datepicker