Convert two more dialogs to actually use Dialog