Refactor the Dialogs and other classes in Designer-Support with @stephde