Refactoring
Using date-pickers