Revert "Dialog fixes & Start DefaultAnswer"

This reverts commit a513c6148fc9314beb95dd9da4903c12a22d901d.