Updated Datepicker and Comments