pretty much done with Jon dialogs

title
fixes merge conflict

title