fixed the datepicker
Fixed the categories list
datepicker fix
merging