add date pickers, refactoring