Added datepicker, removed jqueryui