Add a date picker.
Merge with edit dialog.
Cleanup