Revert "Dialog Improvements"

This reverts commit 4e362e53570a21f59d72c1ac0e783f45ef6000a1.