DatePicker

Date picker function and small other changes