Cleaned up Dialog
Merge branch 'hz-kwl-dialog-continued' into Helen-dialog-continue