comented out datetimepicker crisscross logic, enlarged clock icon in datetimepicker
merged with development