#367 |+Sandeep| Improving date selection while adding new period