Add edit, improve date picker