Datepicker tweeks
Conflict fix