pras validations
dates optimizations
modified date picker
js fix
fixed merge conflics