DatePicker twaeking

Fixed DatePicker exception
Formatting issues