Sync for modeditdialog and legacymodeditdialog changes

Handle with caution..

with love,
Tak