Date picker input refactor...