RecordDialog Refactor