changed datepicker and fixed js inclusion