Add datepicker JS library
Fix conflicts