Modal done except for Date picker. #3. #4