Date Picker corrected but not perfect....